rinkhals: gamelib/gameboard.py annotate

annotate gamelib/gameboard.py @ 447:f04a2490c35f

The sub-toolbar rewrite, the finally not crashing version

author	Neil Muller <drnlmuller@gmail.com>
date	Sat, 21 Nov 2009 19:58:49 +0000
parents	feb9b7a23ef2
children	938498b8cd03

rev	line source
69 18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	1 import random
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	2
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	3 import pygame
262 d508248041ff avoid passing events in twice Neil Muller <drnlmuller@gmail.com> parents: 258 diff changeset	4 from pygame.locals import MOUSEBUTTONDOWN, MOUSEMOTION, KEYDOWN, K_UP, K_DOWN, \
d508248041ff avoid passing events in twice Neil Muller <drnlmuller@gmail.com> parents: 258 diff changeset	5 K_LEFT, K_RIGHT
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	6 from pgu import gui
9 3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	7
24 7584453f4944 Add support for PNG tiles. Simon Cross <hodgestar@gmail.com> parents: 17 diff changeset	8 import tiles
79 8241386a1651 Add chicken counter Neil Muller <drnlmuller@gmail.com> parents: 77 diff changeset	9 import icons
40 678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	10 import constants
57 08665fa60345 Implement henhouses and henhouse adding. Simon Cross <hodgestar@gmail.com> parents: 54 diff changeset	11 import buildings
69 18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	12 import animal
84 5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	13 import equipment
94 fa8d8fc1bf5b Added some sounds David Fraser <davidf@sjsoft.com> parents: 92 diff changeset	14 import sound
162 fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	15 import cursors
186 f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	16 import sprite_cursor
241 1a7000c8211c Demolition foxes, including better fox selection. Jeremy Thurgood <firxen@gmail.com> parents: 239 diff changeset	17 import misc
433 8643893635e7 Seperate toolbar and gameboard Neil Muller <drnlmuller@gmail.com> parents: 428 diff changeset	18 import toolbar
444 feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	19 import serializer
152 702bc0eb2ac3 Fix Toolbar width to TOOLBAR_WIDTH by not allowing it to resize. Simon Cross <hodgestar@gmail.com> parents: 151 diff changeset	20
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	21 class VidWidget(gui.Widget):
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	22 def __init__(self, gameboard, vid, **params):
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	23 gui.Widget.__init__(self, **params)
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	24 self.gameboard = gameboard
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	25 self.vid = vid
151 082868bea873 Refactor UI so that only a single gui.App is used. Pass all UI events via main_app. Change Toolbar table to use .td() everywhere. Move toolbar to top. Simon Cross <hodgestar@gmail.com> parents: 148 diff changeset	26 self.vid.bounds = pygame.Rect((0, 0), vid.tile_to_view(vid.size))
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	27
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	28 def paint(self, surface):
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	29 self.vid.paint(surface)
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	30
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	31 def update(self, surface):
380 1586eccdefe4 Ripped out legacy animation infrastructure in favour of layered sprites. Jeremy Thurgood <firxen@gmail.com> parents: 379 diff changeset	32 return self.vid.update(surface)
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	33
39 ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	34 def move_view(self, x, y):
ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	35 self.vid.view.move_ip((x, y))
ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	36
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	37 def event(self, e):
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	38 if e.type == MOUSEBUTTONDOWN:
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	39 self.gameboard.use_tool(e)
186 f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	40 elif e.type == MOUSEMOTION and self.gameboard.sprite_cursor:
f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	41 self.gameboard.update_sprite_cursor(e)
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	42
444 feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	43 class GameBoard(serializer.Simplifiable):
9 3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	44
66 edc15ce8fa30 Implement fence selling (a bit hackish, but fine for now). Simon Cross <hodgestar@gmail.com> parents: 65 diff changeset	45 GRASSLAND = tiles.REVERSE_TILE_MAP['grassland']
edc15ce8fa30 Implement fence selling (a bit hackish, but fine for now). Simon Cross <hodgestar@gmail.com> parents: 65 diff changeset	46 FENCE = tiles.REVERSE_TILE_MAP['fence']
79 8241386a1651 Add chicken counter Neil Muller <drnlmuller@gmail.com> parents: 77 diff changeset	47 WOODLAND = tiles.REVERSE_TILE_MAP['woodland']
69 18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	48 BROKEN_FENCE = tiles.REVERSE_TILE_MAP['broken fence']
66 edc15ce8fa30 Implement fence selling (a bit hackish, but fine for now). Simon Cross <hodgestar@gmail.com> parents: 65 diff changeset	49
444 feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	50 SIMPLIFY = [
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	51 'chickens',
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	52 'buildings',
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	53 'foxes',
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	54 'cash',
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	55 'wood',
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	56 'eggs',
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	57 'days',
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	58 'killed_foxes',
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	59 'day', 'night',
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	60 ]
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	61
389 463802281182 Add basic level support (level choosing needs work) Neil Muller <drnlmuller@gmail.com> parents: 382 diff changeset	62 def __init__(self, main_app, level):
151 082868bea873 Refactor UI so that only a single gui.App is used. Pass all UI events via main_app. Change Toolbar table to use .td() everywhere. Move toolbar to top. Simon Cross <hodgestar@gmail.com> parents: 148 diff changeset	63 self.disp = main_app
389 463802281182 Add basic level support (level choosing needs work) Neil Muller <drnlmuller@gmail.com> parents: 382 diff changeset	64 self.level = level
24 7584453f4944 Add support for PNG tiles. Simon Cross <hodgestar@gmail.com> parents: 17 diff changeset	65 self.tv = tiles.FarmVid()
303 e12d99215b74 Fix up data module unix-to-local path fixing. Fix similar problems in tile importing. Simon Cross <hodgestar@gmail.com> parents: 302 diff changeset	66 self.tv.png_folder_load_tiles('tiles')
389 463802281182 Add basic level support (level choosing needs work) Neil Muller <drnlmuller@gmail.com> parents: 382 diff changeset	67 self.tv.tga_load_level(level.map)
382 e89e6ad011ac Use code layer to place chickens Neil Muller <drnlmuller@gmail.com> parents: 381 diff changeset	68 width, height = self.tv.size
323 978efd39a099 Limit maximum numbe of foxes generated Neil Muller <drnlmuller@gmail.com> parents: 320 diff changeset	69 # Ensure we don't every try to create more foxes then is sane
403 c7cfa230f5d4 Remove board size restriction on number of foxes Neil Muller <drnlmuller@gmail.com> parents: 401 diff changeset	70 self.max_foxes = level.max_foxes
40 678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	71
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	72 self.selected_tool = None
105 7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	73 self.animal_to_place = None
186 f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	74 self.sprite_cursor = None
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	75 self.chickens = set()
d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	76 self.foxes = set()
444 feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	77 self.buildings = set()
401 7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 400 diff changeset	78 self._pos_cache = { 'fox' : [], 'chicken' : []}
40 678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	79 self.cash = 0
422 ab4fc3fe0f96 chickens scatter; chop wood Adrianna Pińska <adrianna.pinska@gmail.com> parents: 421 diff changeset	80 self.wood = 0
118 2c76ed47fc44 Remove chicken respawn at day start. Handle eaten chickens in henhouses better Neil Muller <drnlmuller@gmail.com> parents: 116 diff changeset	81 self.eggs = 0
139 1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	82 self.days = 0
79 8241386a1651 Add chicken counter Neil Muller <drnlmuller@gmail.com> parents: 77 diff changeset	83 self.killed_foxes = 0
223 527a5d4e3fa3 Disable tools at night. Simon Cross <hodgestar@gmail.com> parents: 221 diff changeset	84 self.day, self.night = True, False
424 fbef17cab632 Use fully rendered map in gameboard choosing screen Neil Muller <drnlmuller@gmail.com> parents: 422 diff changeset	85 # For the level loading case
fbef17cab632 Use fully rendered map in gameboard choosing screen Neil Muller <drnlmuller@gmail.com> parents: 422 diff changeset	86 if self.disp:
447 f04a2490c35f The sub-toolbar rewrite, the finally not crashing version Neil Muller <drnlmuller@gmail.com> parents: 444 diff changeset	87 self.toolbar = None
424 fbef17cab632 Use fully rendered map in gameboard choosing screen Neil Muller <drnlmuller@gmail.com> parents: 422 diff changeset	88 self.create_display()
fbef17cab632 Use fully rendered map in gameboard choosing screen Neil Muller <drnlmuller@gmail.com> parents: 422 diff changeset	89 self.add_cash(level.starting_cash)
428 a356e57529ea buildings cost wood Adrianna Pińska <adrianna.pinska@gmail.com> parents: 425 diff changeset	90 self.add_wood(level.starting_wood)
17 cbbc5da7708a Interaction with the game board. Jeremy Thurgood <firxen@gmail.com> parents: 14 diff changeset	91
67 9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	92 self.fix_buildings()
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	93
408 02a6de5629d6 Levels can include starting equipment Neil Muller <drnlmuller@gmail.com> parents: 405 diff changeset	94 cdata = {}
02a6de5629d6 Levels can include starting equipment Neil Muller <drnlmuller@gmail.com> parents: 405 diff changeset	95 for tn in equipment.EQUIP_MAP:
02a6de5629d6 Levels can include starting equipment Neil Muller <drnlmuller@gmail.com> parents: 405 diff changeset	96 cdata[tn] = (self.add_start_chickens, tn)
382 e89e6ad011ac Use code layer to place chickens Neil Muller <drnlmuller@gmail.com> parents: 381 diff changeset	97
e89e6ad011ac Use code layer to place chickens Neil Muller <drnlmuller@gmail.com> parents: 381 diff changeset	98 self.tv.run_codes(cdata, (0,0,width,height))
118 2c76ed47fc44 Remove chicken respawn at day start. Handle eaten chickens in henhouses better Neil Muller <drnlmuller@gmail.com> parents: 116 diff changeset	99
151 082868bea873 Refactor UI so that only a single gui.App is used. Pass all UI events via main_app. Change Toolbar table to use .td() everywhere. Move toolbar to top. Simon Cross <hodgestar@gmail.com> parents: 148 diff changeset	100 def get_top_widget(self):
082868bea873 Refactor UI so that only a single gui.App is used. Pass all UI events via main_app. Change Toolbar table to use .td() everywhere. Move toolbar to top. Simon Cross <hodgestar@gmail.com> parents: 148 diff changeset	101 return self.top_widget
082868bea873 Refactor UI so that only a single gui.App is used. Pass all UI events via main_app. Change Toolbar table to use .td() everywhere. Move toolbar to top. Simon Cross <hodgestar@gmail.com> parents: 148 diff changeset	102
082868bea873 Refactor UI so that only a single gui.App is used. Pass all UI events via main_app. Change Toolbar table to use .td() everywhere. Move toolbar to top. Simon Cross <hodgestar@gmail.com> parents: 148 diff changeset	103 def create_display(self):
082868bea873 Refactor UI so that only a single gui.App is used. Pass all UI events via main_app. Change Toolbar table to use .td() everywhere. Move toolbar to top. Simon Cross <hodgestar@gmail.com> parents: 148 diff changeset	104 width, height = self.disp.rect.w, self.disp.rect.h
36 5569430fd82e Display cleanup and rationalisation. Jeremy Thurgood <firxen@gmail.com> parents: 35 diff changeset	105 tbl = gui.Table()
5569430fd82e Display cleanup and rationalisation. Jeremy Thurgood <firxen@gmail.com> parents: 35 diff changeset	106 tbl.tr()
447 f04a2490c35f The sub-toolbar rewrite, the finally not crashing version Neil Muller <drnlmuller@gmail.com> parents: 444 diff changeset	107 self.toolbar = toolbar.DefaultToolBar(self, width=constants.TOOLBAR_WIDTH)
151 082868bea873 Refactor UI so that only a single gui.App is used. Pass all UI events via main_app. Change Toolbar table to use .td() everywhere. Move toolbar to top. Simon Cross <hodgestar@gmail.com> parents: 148 diff changeset	108 tbl.td(self.toolbar, valign=-1)
433 8643893635e7 Seperate toolbar and gameboard Neil Muller <drnlmuller@gmail.com> parents: 428 diff changeset	109 self.tvw = VidWidget(self, self.tv, width=width-constants.TOOLBAR_WIDTH, height=height)
37 497b53b69280 Always update the vidwidget. Jeremy Thurgood <firxen@gmail.com> parents: 36 diff changeset	110 tbl.td(self.tvw)
151 082868bea873 Refactor UI so that only a single gui.App is used. Pass all UI events via main_app. Change Toolbar table to use .td() everywhere. Move toolbar to top. Simon Cross <hodgestar@gmail.com> parents: 148 diff changeset	111 self.top_widget = tbl
14 d7f295c06a4b Split gameboard screen. Jeremy Thurgood <firxen@gmail.com> parents: 12 diff changeset	112
447 f04a2490c35f The sub-toolbar rewrite, the finally not crashing version Neil Muller <drnlmuller@gmail.com> parents: 444 diff changeset	113 def change_toolbar(self, new_toolbar):
f04a2490c35f The sub-toolbar rewrite, the finally not crashing version Neil Muller <drnlmuller@gmail.com> parents: 444 diff changeset	114 """Replace the toolbar"""
f04a2490c35f The sub-toolbar rewrite, the finally not crashing version Neil Muller <drnlmuller@gmail.com> parents: 444 diff changeset	115 td = self.toolbar.container
f04a2490c35f The sub-toolbar rewrite, the finally not crashing version Neil Muller <drnlmuller@gmail.com> parents: 444 diff changeset	116 td.remove(self.toolbar)
f04a2490c35f The sub-toolbar rewrite, the finally not crashing version Neil Muller <drnlmuller@gmail.com> parents: 444 diff changeset	117 td.add(new_toolbar, 0, 0)
f04a2490c35f The sub-toolbar rewrite, the finally not crashing version Neil Muller <drnlmuller@gmail.com> parents: 444 diff changeset	118 self.toolbar = new_toolbar
f04a2490c35f The sub-toolbar rewrite, the finally not crashing version Neil Muller <drnlmuller@gmail.com> parents: 444 diff changeset	119 self.toolbar.rect.size = self.toolbar.resize(height=td.rect.height)
f04a2490c35f The sub-toolbar rewrite, the finally not crashing version Neil Muller <drnlmuller@gmail.com> parents: 444 diff changeset	120 td.resize()
f04a2490c35f The sub-toolbar rewrite, the finally not crashing version Neil Muller <drnlmuller@gmail.com> parents: 444 diff changeset	121 td.repaint()
f04a2490c35f The sub-toolbar rewrite, the finally not crashing version Neil Muller <drnlmuller@gmail.com> parents: 444 diff changeset	122
151 082868bea873 Refactor UI so that only a single gui.App is used. Pass all UI events via main_app. Change Toolbar table to use .td() everywhere. Move toolbar to top. Simon Cross <hodgestar@gmail.com> parents: 148 diff changeset	123 def update(self):
37 497b53b69280 Always update the vidwidget. Jeremy Thurgood <firxen@gmail.com> parents: 36 diff changeset	124 self.tvw.reupdate()
9 3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	125
3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	126 def loop(self):
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: 24 diff changeset	127 self.tv.loop()
9 3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	128
162 fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	129 def set_selected_tool(self, tool, cursor):
223 527a5d4e3fa3 Disable tools at night. Simon Cross <hodgestar@gmail.com> parents: 221 diff changeset	130 if not self.day:
527a5d4e3fa3 Disable tools at night. Simon Cross <hodgestar@gmail.com> parents: 221 diff changeset	131 return
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	132 self.selected_tool = tool
213 07b361ebd87f Ensure we clean up highlights, etc. Neil Muller <drnlmuller@gmail.com> parents: 212 diff changeset	133 if self.animal_to_place:
07b361ebd87f Ensure we clean up highlights, etc. Neil Muller <drnlmuller@gmail.com> parents: 212 diff changeset	134 # Clear any highlights
305 32149b1d9fd2 Capitalised all equipment names. Jeremy Thurgood <firxen@gmail.com> parents: 303 diff changeset	135 self.animal_to_place.unequip_by_name("Spotlight")
200 67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	136 self.select_animal_to_place(None)
203 653da96db572 Fixed dangling cursor sprite and did some TODO list maintenance. Jeremy Thurgood <firxen@gmail.com> parents: 202 diff changeset	137 sprite_curs = None
653da96db572 Fixed dangling cursor sprite and did some TODO list maintenance. Jeremy Thurgood <firxen@gmail.com> parents: 202 diff changeset	138 if buildings.is_building(tool):
232 0bd214cf9018 Overlay cost on building sprite cursors. Simon Cross <hodgestar@gmail.com> parents: 228 diff changeset	139 sprite_curs = sprite_cursor.SpriteCursor(tool.IMAGE, self.tv, tool.BUY_PRICE)
247 5b9cd693fe7c Add sprite cursors for equipment buying. Simon Cross <hodgestar@gmail.com> parents: 245 diff changeset	140 elif equipment.is_equipment(tool):
5b9cd693fe7c Add sprite cursors for equipment buying. Simon Cross <hodgestar@gmail.com> parents: 245 diff changeset	141 sprite_curs = sprite_cursor.SpriteCursor(tool.CHICKEN_IMAGE_FILE, self.tv)
203 653da96db572 Fixed dangling cursor sprite and did some TODO list maintenance. Jeremy Thurgood <firxen@gmail.com> parents: 202 diff changeset	142 self.set_cursor(cursor, sprite_curs)
653da96db572 Fixed dangling cursor sprite and did some TODO list maintenance. Jeremy Thurgood <firxen@gmail.com> parents: 202 diff changeset	143
653da96db572 Fixed dangling cursor sprite and did some TODO list maintenance. Jeremy Thurgood <firxen@gmail.com> parents: 202 diff changeset	144 def set_cursor(self, cursor=None, sprite_curs=None):
162 fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	145 if cursor:
fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	146 pygame.mouse.set_cursor(*cursor)
fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	147 else:
fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	148 pygame.mouse.set_cursor(*cursors.cursors['arrow'])
379 a8a7ada27fa2 Multilayer sprite ordering. Only used by cursors so far. Jeremy Thurgood <firxen@gmail.com> parents: 378 diff changeset	149 if self.sprite_cursor is not None:
a8a7ada27fa2 Multilayer sprite ordering. Only used by cursors so far. Jeremy Thurgood <firxen@gmail.com> parents: 378 diff changeset	150 self.tv.sprites.remove(self.sprite_cursor, layer='cursor')
218 5cb0e0b9cd16 Make sprite cursors stay on top by fudging the sprite list. :/ Simon Cross <hodgestar@gmail.com> parents: 217 diff changeset	151 self.sprite_cursor = sprite_curs
379 a8a7ada27fa2 Multilayer sprite ordering. Only used by cursors so far. Jeremy Thurgood <firxen@gmail.com> parents: 378 diff changeset	152 if self.sprite_cursor is not None:
a8a7ada27fa2 Multilayer sprite ordering. Only used by cursors so far. Jeremy Thurgood <firxen@gmail.com> parents: 378 diff changeset	153 self.tv.sprites.append(self.sprite_cursor, layer='cursor')
213 07b361ebd87f Ensure we clean up highlights, etc. Neil Muller <drnlmuller@gmail.com> parents: 212 diff changeset	154
07b361ebd87f Ensure we clean up highlights, etc. Neil Muller <drnlmuller@gmail.com> parents: 212 diff changeset	155 def reset_states(self):
07b361ebd87f Ensure we clean up highlights, etc. Neil Muller <drnlmuller@gmail.com> parents: 212 diff changeset	156 """Clear current states (highlights, etc.)"""
245 634491bf37e8 Change toolbar to gui.Toolbar -- gives nicer highlighting. Simon Cross <hodgestar@gmail.com> parents: 243 diff changeset	157 self.set_selected_tool(None, None)
634491bf37e8 Change toolbar to gui.Toolbar -- gives nicer highlighting. Simon Cross <hodgestar@gmail.com> parents: 243 diff changeset	158 self.toolbar.clear_tool()
17 cbbc5da7708a Interaction with the game board. Jeremy Thurgood <firxen@gmail.com> parents: 14 diff changeset	159
186 f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	160 def update_sprite_cursor(self, e):
f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	161 tile_pos = self.tv.screen_to_tile(e.pos)
f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	162 self.sprite_cursor.set_pos(tile_pos)
f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	163
223 527a5d4e3fa3 Disable tools at night. Simon Cross <hodgestar@gmail.com> parents: 221 diff changeset	164 def start_night(self):
527a5d4e3fa3 Disable tools at night. Simon Cross <hodgestar@gmail.com> parents: 221 diff changeset	165 self.day, self.night = False, True
527a5d4e3fa3 Disable tools at night. Simon Cross <hodgestar@gmail.com> parents: 221 diff changeset	166 self.tv.sun(False)
527a5d4e3fa3 Disable tools at night. Simon Cross <hodgestar@gmail.com> parents: 221 diff changeset	167 self.reset_states()
434 f2a55e5e24db Disable non-selectable toolbar widgets at night Neil Muller <drnlmuller@gmail.com> parents: 433 diff changeset	168 self.toolbar.start_night()
413 bdc4757e0497 Add Sniper Rifle and give guns limited ammunition. Jeremy Thurgood <firxen@gmail.com> parents: 408 diff changeset	169 self.spawn_foxes()
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	170 self.eggs = 0
419 d110d55c8449 Move hatching logic into chickens. Jeremy Thurgood <firxen@gmail.com> parents: 414 diff changeset	171 for chicken in self.chickens.copy():
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	172 chicken.start_night(self)
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 self.toolbar.update_egg_counter(self.eggs)
425 1d0cc37b4e14 Add method for clearing all chickens (will be useful later). Cache animal positions only just before night starts. Range-check position before adding it to the cache. Simon Cross <hodgestar@gmail.com> parents: 424 diff changeset	174 self._cache_animal_positions()
223 527a5d4e3fa3 Disable tools at night. Simon Cross <hodgestar@gmail.com> parents: 221 diff changeset	175
527a5d4e3fa3 Disable tools at night. Simon Cross <hodgestar@gmail.com> parents: 221 diff changeset	176 def start_day(self):
527a5d4e3fa3 Disable tools at night. Simon Cross <hodgestar@gmail.com> parents: 221 diff changeset	177 self.day, self.night = True, False
527a5d4e3fa3 Disable tools at night. Simon Cross <hodgestar@gmail.com> parents: 221 diff changeset	178 self.tv.sun(True)
527a5d4e3fa3 Disable tools at night. Simon Cross <hodgestar@gmail.com> parents: 221 diff changeset	179 self.reset_states()
434 f2a55e5e24db Disable non-selectable toolbar widgets at night Neil Muller <drnlmuller@gmail.com> parents: 433 diff changeset	180 self.toolbar.start_day()
401 7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 400 diff changeset	181 self._pos_cache = { 'fox' : [], 'chicken' : []}
413 bdc4757e0497 Add Sniper Rifle and give guns limited ammunition. Jeremy Thurgood <firxen@gmail.com> parents: 408 diff changeset	182 self.advance_day()
bdc4757e0497 Add Sniper Rifle and give guns limited ammunition. Jeremy Thurgood <firxen@gmail.com> parents: 408 diff changeset	183 self.clear_foxes()
419 d110d55c8449 Move hatching logic into chickens. Jeremy Thurgood <firxen@gmail.com> parents: 414 diff changeset	184 for chicken in self.chickens.copy():
d110d55c8449 Move hatching logic into chickens. Jeremy Thurgood <firxen@gmail.com> parents: 414 diff changeset	185 chicken.start_day(self)
d110d55c8449 Move hatching logic into chickens. Jeremy Thurgood <firxen@gmail.com> parents: 414 diff changeset	186 self.toolbar.update_egg_counter(self.eggs)
223 527a5d4e3fa3 Disable tools at night. Simon Cross <hodgestar@gmail.com> parents: 221 diff changeset	187
69 18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	188 def in_bounds(self, pos):
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	189 """Check if a position is within the game boundaries"""
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	190 if pos.x < 0 or pos.y < 0:
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	191 return False
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	192 width, height = self.tv.size
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	193 if pos.x >= width or pos.y >= height:
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	194 return False
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	195 return True
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	196
17 cbbc5da7708a Interaction with the game board. Jeremy Thurgood <firxen@gmail.com> parents: 14 diff changeset	197 def use_tool(self, e):
223 527a5d4e3fa3 Disable tools at night. Simon Cross <hodgestar@gmail.com> parents: 221 diff changeset	198 if not self.day:
527a5d4e3fa3 Disable tools at night. Simon Cross <hodgestar@gmail.com> parents: 221 diff changeset	199 return
189 37af9e5dd292 Use tool with left button, cancel tool with right button. Jeremy Thurgood <firxen@gmail.com> parents: 186 diff changeset	200 if e.button == 3: # Right button
275 678be1afc307 Fix minor bug in clearing of tool state on right-click. Simon Cross <hodgestar@gmail.com> parents: 272 diff changeset	201 self.set_selected_tool(None, None)
678be1afc307 Fix minor bug in clearing of tool state on right-click. Simon Cross <hodgestar@gmail.com> parents: 272 diff changeset	202 self.toolbar.clear_tool()
189 37af9e5dd292 Use tool with left button, cancel tool with right button. Jeremy Thurgood <firxen@gmail.com> parents: 186 diff changeset	203 elif e.button != 1: # Left button
37af9e5dd292 Use tool with left button, cancel tool with right button. Jeremy Thurgood <firxen@gmail.com> parents: 186 diff changeset	204 return
52 0d4799866bcf Sell chickens and buy fences. Jeremy Thurgood <firxen@gmail.com> parents: 40 diff changeset	205 if self.selected_tool == constants.TOOL_SELL_CHICKEN:
105 7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	206 self.sell_chicken(self.tv.screen_to_tile(e.pos))
57 08665fa60345 Implement henhouses and henhouse adding. Simon Cross <hodgestar@gmail.com> parents: 54 diff changeset	207 elif self.selected_tool == constants.TOOL_SELL_EGG:
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	208 self.sell_egg(self.tv.screen_to_tile(e.pos))
105 7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	209 elif self.selected_tool == constants.TOOL_PLACE_ANIMALS:
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	210 self.place_animal(self.tv.screen_to_tile(e.pos))
65 7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	211 elif self.selected_tool == constants.TOOL_SELL_BUILDING:
7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	212 self.sell_building(self.tv.screen_to_tile(e.pos))
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	213 elif self.selected_tool == constants.TOOL_SELL_EQUIPMENT:
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	214 self.sell_equipment(self.tv.screen_to_tile(e.pos))
378 71f5897ac5ef Fences are now buildings, with appropriate (but ugly) UI changes. Jeremy Thurgood <firxen@gmail.com> parents: 361 diff changeset	215 elif self.selected_tool == constants.TOOL_REPAIR_BUILDING:
71f5897ac5ef Fences are now buildings, with appropriate (but ugly) UI changes. Jeremy Thurgood <firxen@gmail.com> parents: 361 diff changeset	216 self.repair_building(self.tv.screen_to_tile(e.pos))
64 99fbb652ce8d Refactor buildings so that new ones can be added just by adding a class to buildings.py. Simon Cross <hodgestar@gmail.com> parents: 60 diff changeset	217 elif buildings.is_building(self.selected_tool):
65 7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	218 self.buy_building(self.tv.screen_to_tile(e.pos), self.selected_tool)
109 48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	219 elif equipment.is_equipment(self.selected_tool):
48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	220 self.buy_equipment(self.tv.screen_to_tile(e.pos), self.selected_tool)
17 cbbc5da7708a Interaction with the game board. Jeremy Thurgood <firxen@gmail.com> parents: 14 diff changeset	221
166 4aa800354b7c Rename get_chicken to get_outside_chicken. Simon Cross <hodgestar@gmail.com> parents: 165 diff changeset	222 def get_outside_chicken(self, tile_pos):
54 b8f64db0d39e Cleaned up buying and selling a bit. Jeremy Thurgood <firxen@gmail.com> parents: 52 diff changeset	223 for chick in self.chickens:
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	224 if chick.covers(tile_pos) and chick.outside():
54 b8f64db0d39e Cleaned up buying and selling a bit. Jeremy Thurgood <firxen@gmail.com> parents: 52 diff changeset	225 return chick
b8f64db0d39e Cleaned up buying and selling a bit. Jeremy Thurgood <firxen@gmail.com> parents: 52 diff changeset	226 return None
57 08665fa60345 Implement henhouses and henhouse adding. Simon Cross <hodgestar@gmail.com> parents: 54 diff changeset	227
105 7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	228 def get_building(self, tile_pos):
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	229 for building in self.buildings:
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	230 if building.covers(tile_pos):
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	231 return building
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	232 return None
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	233
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	234 def sell_chicken(self, tile_pos):
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	235
310 49c58dda8ac2 Refactor sell_callback, so sell_equipment work Neil Muller <drnlmuller@gmail.com> parents: 307 diff changeset	236 def do_sell(chicken, update_button=None):
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	237 if not chicken:
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	238 return False # sanity check
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	239 if len(self.chickens) == 1:
326 89f51d513606 Add TextDialog class and use it to warn about selling your last chicken. Simon Cross <hodgestar@gmail.com> parents: 325 diff changeset	240 msg = "You can't sell your last chicken!"
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken. Simon Cross <hodgestar@gmail.com> parents: 325 diff changeset	241 TextDialog("Squuaaawwwwwk!", msg).open()
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	242 return False
228 f74de4280e20 Sell chicken's equipment when you sell the chicken. Simon Cross <hodgestar@gmail.com> parents: 227 diff changeset	243 for item in list(chicken.equipment):
f74de4280e20 Sell chicken's equipment when you sell the chicken. Simon Cross <hodgestar@gmail.com> parents: 227 diff changeset	244 self.add_cash(item.sell_price())
f74de4280e20 Sell chicken's equipment when you sell the chicken. Simon Cross <hodgestar@gmail.com> parents: 227 diff changeset	245 chicken.unequip(item)
389 463802281182 Add basic level support (level choosing needs work) Neil Muller <drnlmuller@gmail.com> parents: 382 diff changeset	246 self.add_cash(self.level.sell_price_chicken)
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	247 sound.play_sound("sell-chicken.ogg")
310 49c58dda8ac2 Refactor sell_callback, so sell_equipment work Neil Muller <drnlmuller@gmail.com> parents: 307 diff changeset	248 if update_button:
49c58dda8ac2 Refactor sell_callback, so sell_equipment work Neil Muller <drnlmuller@gmail.com> parents: 307 diff changeset	249 update_button(chicken, empty=True)
49c58dda8ac2 Refactor sell_callback, so sell_equipment work Neil Muller <drnlmuller@gmail.com> parents: 307 diff changeset	250 self.remove_chicken(chicken)
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	251 return True
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	252
166 4aa800354b7c Rename get_chicken to get_outside_chicken. Simon Cross <hodgestar@gmail.com> parents: 165 diff changeset	253 chick = self.get_outside_chicken(tile_pos)
54 b8f64db0d39e Cleaned up buying and selling a bit. Jeremy Thurgood <firxen@gmail.com> parents: 52 diff changeset	254 if chick is None:
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	255 building = self.get_building(tile_pos)
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	256 if building and building.HENHOUSE:
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	257 self.open_building_dialog(building, do_sell)
54 b8f64db0d39e Cleaned up buying and selling a bit. Jeremy Thurgood <firxen@gmail.com> parents: 52 diff changeset	258 return
310 49c58dda8ac2 Refactor sell_callback, so sell_equipment work Neil Muller <drnlmuller@gmail.com> parents: 307 diff changeset	259 do_sell(chick)
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	260
243 4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	261 def sell_one_egg(self, chicken):
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	262 if chicken.eggs:
389 463802281182 Add basic level support (level choosing needs work) Neil Muller <drnlmuller@gmail.com> parents: 382 diff changeset	263 self.add_cash(self.level.sell_price_egg)
243 4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	264 chicken.remove_one_egg()
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	265 self.eggs -= 1
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	266 self.toolbar.update_egg_counter(self.eggs)
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	267 return True
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	268 return False
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	269
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	270 def sell_egg(self, tile_pos):
310 49c58dda8ac2 Refactor sell_callback, so sell_equipment work Neil Muller <drnlmuller@gmail.com> parents: 307 diff changeset	271 def do_sell(chicken, update_button=None):
243 4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	272 # We try sell and egg
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	273 if self.sell_one_egg(chicken):
193 db246683d5da Selling eggs now works Neil Muller <drnlmuller@gmail.com> parents: 192 diff changeset	274 sound.play_sound("sell-chicken.ogg")
243 4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	275 # Force toolbar update
193 db246683d5da Selling eggs now works Neil Muller <drnlmuller@gmail.com> parents: 192 diff changeset	276 self.toolbar.chsize()
310 49c58dda8ac2 Refactor sell_callback, so sell_equipment work Neil Muller <drnlmuller@gmail.com> parents: 307 diff changeset	277 if update_button:
49c58dda8ac2 Refactor sell_callback, so sell_equipment work Neil Muller <drnlmuller@gmail.com> parents: 307 diff changeset	278 update_button(chicken)
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	279 return False
193 db246683d5da Selling eggs now works Neil Muller <drnlmuller@gmail.com> parents: 192 diff changeset	280
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	281 building = self.get_building(tile_pos)
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	282 if building and building.HENHOUSE:
193 db246683d5da Selling eggs now works Neil Muller <drnlmuller@gmail.com> parents: 192 diff changeset	283 self.open_building_dialog(building, do_sell)
54 b8f64db0d39e Cleaned up buying and selling a bit. Jeremy Thurgood <firxen@gmail.com> parents: 52 diff changeset	284
200 67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	285 def select_animal_to_place(self, animal):
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	286 if self.animal_to_place:
305 32149b1d9fd2 Capitalised all equipment names. Jeremy Thurgood <firxen@gmail.com> parents: 303 diff changeset	287 self.animal_to_place.unequip_by_name("Spotlight")
200 67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	288 self.animal_to_place = animal
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	289 if self.animal_to_place:
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	290 self.animal_to_place.equip(equipment.Spotlight())
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	291
105 7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	292 def place_animal(self, tile_pos):
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	293 """Handle an TOOL_PLACE_ANIMALS click.
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	294
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	295 This will either select an animal or
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	296 place a selected animal in a building.
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	297 """
166 4aa800354b7c Rename get_chicken to get_outside_chicken. Simon Cross <hodgestar@gmail.com> parents: 165 diff changeset	298 chicken = self.get_outside_chicken(tile_pos)
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	299 if chicken:
108 437cbd856a03 Add occupants and abodes. Allowing moving chickens around. Simon Cross <hodgestar@gmail.com> parents: 105 diff changeset	300 if chicken is self.animal_to_place:
200 67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	301 self.select_animal_to_place(None)
165 c7d496556475 Minor cursor bugfixes Neil Muller <drnlmuller@gmail.com> parents: 164 diff changeset	302 pygame.mouse.set_cursor(*cursors.cursors['select'])
108 437cbd856a03 Add occupants and abodes. Allowing moving chickens around. Simon Cross <hodgestar@gmail.com> parents: 105 diff changeset	303 else:
200 67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	304 self.select_animal_to_place(chicken)
162 fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	305 pygame.mouse.set_cursor(*cursors.cursors['chicken'])
105 7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	306 return
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	307 building = self.get_building(tile_pos)
378 71f5897ac5ef Fences are now buildings, with appropriate (but ugly) UI changes. Jeremy Thurgood <firxen@gmail.com> parents: 361 diff changeset	308 if building and building.ABODE:
197 d74693555b86 Put chickens into first empty space in buildings to make it easier to add lots of chickens. Simon Cross <hodgestar@gmail.com> parents: 194 diff changeset	309 if self.animal_to_place:
d74693555b86 Put chickens into first empty space in buildings to make it easier to add lots of chickens. Simon Cross <hodgestar@gmail.com> parents: 194 diff changeset	310 try:
d74693555b86 Put chickens into first empty space in buildings to make it easier to add lots of chickens. Simon Cross <hodgestar@gmail.com> parents: 194 diff changeset	311 place = building.first_empty_place()
d74693555b86 Put chickens into first empty space in buildings to make it easier to add lots of chickens. Simon Cross <hodgestar@gmail.com> parents: 194 diff changeset	312 self.relocate_animal(self.animal_to_place, place=place)
201 fe1e9c18d4d7 layering bugfix; indoor chickens now use normal chicken icons Adrianna Pińska <adrianna.pinska@gmail.com> parents: 200 diff changeset	313 self.animal_to_place.equip(equipment.Nest())
200 67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	314 self.select_animal_to_place(None)
197 d74693555b86 Put chickens into first empty space in buildings to make it easier to add lots of chickens. Simon Cross <hodgestar@gmail.com> parents: 194 diff changeset	315 pygame.mouse.set_cursor(*cursors.cursors['select'])
d74693555b86 Put chickens into first empty space in buildings to make it easier to add lots of chickens. Simon Cross <hodgestar@gmail.com> parents: 194 diff changeset	316 except buildings.BuildingFullError:
d74693555b86 Put chickens into first empty space in buildings to make it easier to add lots of chickens. Simon Cross <hodgestar@gmail.com> parents: 194 diff changeset	317 pass
d74693555b86 Put chickens into first empty space in buildings to make it easier to add lots of chickens. Simon Cross <hodgestar@gmail.com> parents: 194 diff changeset	318 else:
d74693555b86 Put chickens into first empty space in buildings to make it easier to add lots of chickens. Simon Cross <hodgestar@gmail.com> parents: 194 diff changeset	319 self.open_building_dialog(building)
108 437cbd856a03 Add occupants and abodes. Allowing moving chickens around. Simon Cross <hodgestar@gmail.com> parents: 105 diff changeset	320 return
437cbd856a03 Add occupants and abodes. Allowing moving chickens around. Simon Cross <hodgestar@gmail.com> parents: 105 diff changeset	321 if self.tv.get(tile_pos) == self.GRASSLAND:
437cbd856a03 Add occupants and abodes. Allowing moving chickens around. Simon Cross <hodgestar@gmail.com> parents: 105 diff changeset	322 if self.animal_to_place is not None:
305 32149b1d9fd2 Capitalised all equipment names. Jeremy Thurgood <firxen@gmail.com> parents: 303 diff changeset	323 self.animal_to_place.unequip_by_name("Nest")
197 d74693555b86 Put chickens into first empty space in buildings to make it easier to add lots of chickens. Simon Cross <hodgestar@gmail.com> parents: 194 diff changeset	324 self.relocate_animal(self.animal_to_place, tile_pos=tile_pos)
243 4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	325 self.eggs -= self.animal_to_place.get_num_eggs()
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	326 self.animal_to_place.remove_eggs()
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	327 self.toolbar.update_egg_counter(self.eggs)
197 d74693555b86 Put chickens into first empty space in buildings to make it easier to add lots of chickens. Simon Cross <hodgestar@gmail.com> parents: 194 diff changeset	328
d74693555b86 Put chickens into first empty space in buildings to make it easier to add lots of chickens. Simon Cross <hodgestar@gmail.com> parents: 194 diff changeset	329 def relocate_animal(self, chicken, tile_pos=None, place=None):
d74693555b86 Put chickens into first empty space in buildings to make it easier to add lots of chickens. Simon Cross <hodgestar@gmail.com> parents: 194 diff changeset	330 assert((tile_pos, place) != (None, None))
d74693555b86 Put chickens into first empty space in buildings to make it easier to add lots of chickens. Simon Cross <hodgestar@gmail.com> parents: 194 diff changeset	331 if chicken.abode is not None:
d74693555b86 Put chickens into first empty space in buildings to make it easier to add lots of chickens. Simon Cross <hodgestar@gmail.com> parents: 194 diff changeset	332 chicken.abode.clear_occupant()
d74693555b86 Put chickens into first empty space in buildings to make it easier to add lots of chickens. Simon Cross <hodgestar@gmail.com> parents: 194 diff changeset	333 if tile_pos:
d74693555b86 Put chickens into first empty space in buildings to make it easier to add lots of chickens. Simon Cross <hodgestar@gmail.com> parents: 194 diff changeset	334 chicken.set_pos(tile_pos)
d74693555b86 Put chickens into first empty space in buildings to make it easier to add lots of chickens. Simon Cross <hodgestar@gmail.com> parents: 194 diff changeset	335 else:
d74693555b86 Put chickens into first empty space in buildings to make it easier to add lots of chickens. Simon Cross <hodgestar@gmail.com> parents: 194 diff changeset	336 place.set_occupant(chicken)
d74693555b86 Put chickens into first empty space in buildings to make it easier to add lots of chickens. Simon Cross <hodgestar@gmail.com> parents: 194 diff changeset	337 chicken.set_pos(place.get_pos())
d74693555b86 Put chickens into first empty space in buildings to make it easier to add lots of chickens. Simon Cross <hodgestar@gmail.com> parents: 194 diff changeset	338 self.set_visibility(chicken)
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	339
397 532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	340 def set_visibility(self, animal):
532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	341 if animal.outside():
532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	342 if animal not in self.tv.sprites:
532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	343 self.tv.sprites.append(animal)
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	344 else:
397 532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	345 if animal in self.tv.sprites:
532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	346 self.tv.sprites.remove(animal)
105 7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	347
302 01c1682dc250 Mostly working selling equipment in buildings Neil Muller <drnlmuller@gmail.com> parents: 298 diff changeset	348 def open_dialog(self, widget, x=None, y=None, close_callback=None):
115 2b2007e231da Start of dialog for placing chickens in buildings. Remove chicken in hen house bug by not allowing chickens in hen houses. Simon Cross <hodgestar@gmail.com> parents: 109 diff changeset	349 """Open a dialog for the given widget. Add close button."""
2b2007e231da Start of dialog for placing chickens in buildings. Remove chicken in hen house bug by not allowing chickens in hen houses. Simon Cross <hodgestar@gmail.com> parents: 109 diff changeset	350 tbl = gui.Table()
2b2007e231da Start of dialog for placing chickens in buildings. Remove chicken in hen house bug by not allowing chickens in hen houses. Simon Cross <hodgestar@gmail.com> parents: 109 diff changeset	351
2b2007e231da Start of dialog for placing chickens in buildings. Remove chicken in hen house bug by not allowing chickens in hen houses. Simon Cross <hodgestar@gmail.com> parents: 109 diff changeset	352 def close_dialog():
2b2007e231da Start of dialog for placing chickens in buildings. Remove chicken in hen house bug by not allowing chickens in hen houses. Simon Cross <hodgestar@gmail.com> parents: 109 diff changeset	353 self.disp.close(tbl)
170 92d11e0544bc Switch building to selected image when building is selected. Simon Cross <hodgestar@gmail.com> parents: 169 diff changeset	354 if close_callback is not None:
92d11e0544bc Switch building to selected image when building is selected. Simon Cross <hodgestar@gmail.com> parents: 169 diff changeset	355 close_callback()
115 2b2007e231da Start of dialog for placing chickens in buildings. Remove chicken in hen house bug by not allowing chickens in hen houses. Simon Cross <hodgestar@gmail.com> parents: 109 diff changeset	356
2b2007e231da Start of dialog for placing chickens in buildings. Remove chicken in hen house bug by not allowing chickens in hen houses. Simon Cross <hodgestar@gmail.com> parents: 109 diff changeset	357 close_button = gui.Button("Close")
2b2007e231da Start of dialog for placing chickens in buildings. Remove chicken in hen house bug by not allowing chickens in hen houses. Simon Cross <hodgestar@gmail.com> parents: 109 diff changeset	358 close_button.connect(gui.CLICK, close_dialog)
2b2007e231da Start of dialog for placing chickens in buildings. Remove chicken in hen house bug by not allowing chickens in hen houses. Simon Cross <hodgestar@gmail.com> parents: 109 diff changeset	359
2b2007e231da Start of dialog for placing chickens in buildings. Remove chicken in hen house bug by not allowing chickens in hen houses. Simon Cross <hodgestar@gmail.com> parents: 109 diff changeset	360 tbl = gui.Table()
2b2007e231da Start of dialog for placing chickens in buildings. Remove chicken in hen house bug by not allowing chickens in hen houses. Simon Cross <hodgestar@gmail.com> parents: 109 diff changeset	361 tbl.tr()
2b2007e231da Start of dialog for placing chickens in buildings. Remove chicken in hen house bug by not allowing chickens in hen houses. Simon Cross <hodgestar@gmail.com> parents: 109 diff changeset	362 tbl.td(widget, colspan=2)
2b2007e231da Start of dialog for placing chickens in buildings. Remove chicken in hen house bug by not allowing chickens in hen houses. Simon Cross <hodgestar@gmail.com> parents: 109 diff changeset	363 tbl.tr()
2b2007e231da Start of dialog for placing chickens in buildings. Remove chicken in hen house bug by not allowing chickens in hen houses. Simon Cross <hodgestar@gmail.com> parents: 109 diff changeset	364 tbl.td(gui.Spacer(100, 0))
172 f7f29f1d434b Don't allow occupied buildings to be sold (dialog can probably be dropped once buildings show their number of occupants). Simon Cross <hodgestar@gmail.com> parents: 170 diff changeset	365 tbl.td(close_button, align=1)
115 2b2007e231da Start of dialog for placing chickens in buildings. Remove chicken in hen house bug by not allowing chickens in hen houses. Simon Cross <hodgestar@gmail.com> parents: 109 diff changeset	366
302 01c1682dc250 Mostly working selling equipment in buildings Neil Muller <drnlmuller@gmail.com> parents: 298 diff changeset	367 if x:
01c1682dc250 Mostly working selling equipment in buildings Neil Muller <drnlmuller@gmail.com> parents: 298 diff changeset	368 offset = (self.disp.rect.center[0] + x,
01c1682dc250 Mostly working selling equipment in buildings Neil Muller <drnlmuller@gmail.com> parents: 298 diff changeset	369 self.disp.rect.center[1] + y)
01c1682dc250 Mostly working selling equipment in buildings Neil Muller <drnlmuller@gmail.com> parents: 298 diff changeset	370 else:
01c1682dc250 Mostly working selling equipment in buildings Neil Muller <drnlmuller@gmail.com> parents: 298 diff changeset	371 offset = None
01c1682dc250 Mostly working selling equipment in buildings Neil Muller <drnlmuller@gmail.com> parents: 298 diff changeset	372 self.disp.open(tbl, pos=offset)
169 946f09ed37cd Make equipment dialog close after selecting an item to sell. Simon Cross <hodgestar@gmail.com> parents: 168 diff changeset	373 return tbl
115 2b2007e231da Start of dialog for placing chickens in buildings. Remove chicken in hen house bug by not allowing chickens in hen houses. Simon Cross <hodgestar@gmail.com> parents: 109 diff changeset	374
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	375 def open_building_dialog(self, building, sell_callback=None):
115 2b2007e231da Start of dialog for placing chickens in buildings. Remove chicken in hen house bug by not allowing chickens in hen houses. Simon Cross <hodgestar@gmail.com> parents: 109 diff changeset	376 """Create dialog for manipulating the contents of a building."""
208 f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	377
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	378 place_button_map = {}
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	379
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	380 def update_button(animal, empty=False):
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	381 """Update a button image (either to the animal, or to empty)."""
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	382 if animal:
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	383 button = place_button_map.get(id(animal.abode))
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	384 if button:
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	385 if empty:
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	386 button.value = icons.EMPTY_NEST_ICON
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	387 else:
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	388 button.value = icons.animal_icon(animal)
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	389
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	390 def nest_clicked(place, button):
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	391 """Handle a nest being clicked."""
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	392 if place.occupant:
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	393 # there is an occupant, select or sell it
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	394 if not sell_callback:
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	395 old_animal = self.animal_to_place
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	396 self.select_animal_to_place(place.occupant)
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	397 # deselect old animal (on button)
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	398 update_button(old_animal)
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	399 # select new animal (on button)
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	400 update_button(self.animal_to_place)
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	401 else:
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	402 # Attempt to sell the occupant
310 49c58dda8ac2 Refactor sell_callback, so sell_equipment work Neil Muller <drnlmuller@gmail.com> parents: 307 diff changeset	403 sell_callback(place.occupant, update_button)
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	404 else:
208 f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	405 # there is no occupant, attempt to fill the space
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	406 if self.animal_to_place is not None:
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	407 # empty old nest (on button)
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	408 update_button(self.animal_to_place, empty=True)
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	409 self.relocate_animal(self.animal_to_place, place=place)
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	410 # populate the new nest (on button)
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	411 update_button(self.animal_to_place)
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	412
115 2b2007e231da Start of dialog for placing chickens in buildings. Remove chicken in hen house bug by not allowing chickens in hen houses. Simon Cross <hodgestar@gmail.com> parents: 109 diff changeset	413 tbl = gui.Table()
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	414 columns = building.max_floor_width()
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	415 kwargs = { 'style': { 'padding_left': 10, 'padding_bottom': 10 }}
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	416 for floor in building.floors():
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	417 tbl.tr()
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	418 tbl.td(gui.Button(floor.title), colspan=columns, align=-1, **kwargs)
115 2b2007e231da Start of dialog for placing chickens in buildings. Remove chicken in hen house bug by not allowing chickens in hen houses. Simon Cross <hodgestar@gmail.com> parents: 109 diff changeset	419 tbl.tr()
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	420 for row in floor.rows():
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	421 tbl.tr()
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	422 for place in row:
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	423 if place.occupant is None:
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	424 button = gui.Button(icons.EMPTY_NEST_ICON)
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	425 else:
201 fe1e9c18d4d7 layering bugfix; indoor chickens now use normal chicken icons Adrianna Pińska <adrianna.pinska@gmail.com> parents: 200 diff changeset	426 button = gui.Button(icons.animal_icon(place.occupant))
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	427 place_button_map[id(place)] = button
208 f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	428 button.connect(gui.CLICK, nest_clicked, place, button)
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	429 tbl.td(button, **kwargs)
115 2b2007e231da Start of dialog for placing chickens in buildings. Remove chicken in hen house bug by not allowing chickens in hen houses. Simon Cross <hodgestar@gmail.com> parents: 109 diff changeset	430
170 92d11e0544bc Switch building to selected image when building is selected. Simon Cross <hodgestar@gmail.com> parents: 169 diff changeset	431 building.selected(True)
92d11e0544bc Switch building to selected image when building is selected. Simon Cross <hodgestar@gmail.com> parents: 169 diff changeset	432 def close_callback():
92d11e0544bc Switch building to selected image when building is selected. Simon Cross <hodgestar@gmail.com> parents: 169 diff changeset	433 building.selected(False)
92d11e0544bc Switch building to selected image when building is selected. Simon Cross <hodgestar@gmail.com> parents: 169 diff changeset	434
262 d508248041ff avoid passing events in twice Neil Muller <drnlmuller@gmail.com> parents: 258 diff changeset	435 def evict_callback():
264 812bd4cda8b8 evict button Neil Muller <drnlmuller@gmail.com> parents: 262 diff changeset	436 if not self.animal_to_place:
812bd4cda8b8 evict button Neil Muller <drnlmuller@gmail.com> parents: 262 diff changeset	437 return
812bd4cda8b8 evict button Neil Muller <drnlmuller@gmail.com> parents: 262 diff changeset	438 for tile_pos in building.adjacent_tiles():
812bd4cda8b8 evict button Neil Muller <drnlmuller@gmail.com> parents: 262 diff changeset	439 if self.tv.get(tile_pos) != self.GRASSLAND:
812bd4cda8b8 evict button Neil Muller <drnlmuller@gmail.com> parents: 262 diff changeset	440 continue
812bd4cda8b8 evict button Neil Muller <drnlmuller@gmail.com> parents: 262 diff changeset	441 if self.get_outside_chicken(tile_pos) is None:
812bd4cda8b8 evict button Neil Muller <drnlmuller@gmail.com> parents: 262 diff changeset	442 update_button(self.animal_to_place, empty=True)
812bd4cda8b8 evict button Neil Muller <drnlmuller@gmail.com> parents: 262 diff changeset	443 self.place_animal(tile_pos)
812bd4cda8b8 evict button Neil Muller <drnlmuller@gmail.com> parents: 262 diff changeset	444 break
262 d508248041ff avoid passing events in twice Neil Muller <drnlmuller@gmail.com> parents: 258 diff changeset	445
d508248041ff avoid passing events in twice Neil Muller <drnlmuller@gmail.com> parents: 258 diff changeset	446 if not sell_callback:
d508248041ff avoid passing events in twice Neil Muller <drnlmuller@gmail.com> parents: 258 diff changeset	447 tbl.tr()
d508248041ff avoid passing events in twice Neil Muller <drnlmuller@gmail.com> parents: 258 diff changeset	448 button = gui.Button('Evict')
d508248041ff avoid passing events in twice Neil Muller <drnlmuller@gmail.com> parents: 258 diff changeset	449 button.connect(gui.CLICK, evict_callback)
d508248041ff avoid passing events in twice Neil Muller <drnlmuller@gmail.com> parents: 258 diff changeset	450 tbl.td(button, colspan=2, **kwargs)
d508248041ff avoid passing events in twice Neil Muller <drnlmuller@gmail.com> parents: 258 diff changeset	451
170 92d11e0544bc Switch building to selected image when building is selected. Simon Cross <hodgestar@gmail.com> parents: 169 diff changeset	452 self.open_dialog(tbl, close_callback=close_callback)
105 7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	453
65 7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	454 def buy_building(self, tile_pos, building_cls):
7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	455 building = building_cls(tile_pos)
428 a356e57529ea buildings cost wood Adrianna Pińska <adrianna.pinska@gmail.com> parents: 425 diff changeset	456 if self.wood < building.buy_price():
57 08665fa60345 Implement henhouses and henhouse adding. Simon Cross <hodgestar@gmail.com> parents: 54 diff changeset	457 return
191 3c80f49d7d74 Don't allow buildings and fences to be built on top of chickens. Simon Cross <hodgestar@gmail.com> parents: 189 diff changeset	458 if any(building.covers((chicken.pos.x, chicken.pos.y)) for chicken in self.chickens):
3c80f49d7d74 Don't allow buildings and fences to be built on top of chickens. Simon Cross <hodgestar@gmail.com> parents: 189 diff changeset	459 return
64 99fbb652ce8d Refactor buildings so that new ones can be added just by adding a class to buildings.py. Simon Cross <hodgestar@gmail.com> parents: 60 diff changeset	460 if building.place(self.tv):
428 a356e57529ea buildings cost wood Adrianna Pińska <adrianna.pinska@gmail.com> parents: 425 diff changeset	461 self.add_wood(-building.buy_price())
64 99fbb652ce8d Refactor buildings so that new ones can be added just by adding a class to buildings.py. Simon Cross <hodgestar@gmail.com> parents: 60 diff changeset	462 self.add_building(building)
60 e2631c8e2cd6 Implement guard towers (with temporary sprite PNG). Simon Cross <hodgestar@gmail.com> parents: 57 diff changeset	463
109 48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	464 def buy_equipment(self, tile_pos, equipment_cls):
298 88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	465
109 48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	466 equipment = equipment_cls()
298 88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	467
310 49c58dda8ac2 Refactor sell_callback, so sell_equipment work Neil Muller <drnlmuller@gmail.com> parents: 307 diff changeset	468 def do_equip(chicken, update_button=None):
298 88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	469 # Try to equip the chicken
361 d2acf43aba6f Don't go into debt when buying equipment in buildings Neil Muller <drnlmuller@gmail.com> parents: 360 diff changeset	470 if self.cash < equipment.buy_price():
d2acf43aba6f Don't go into debt when buying equipment in buildings Neil Muller <drnlmuller@gmail.com> parents: 360 diff changeset	471 return False
298 88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	472 if equipment.place(chicken):
88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	473 self.add_cash(-equipment.buy_price())
88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	474 chicken.equip(equipment)
310 49c58dda8ac2 Refactor sell_callback, so sell_equipment work Neil Muller <drnlmuller@gmail.com> parents: 307 diff changeset	475 if update_button:
49c58dda8ac2 Refactor sell_callback, so sell_equipment work Neil Muller <drnlmuller@gmail.com> parents: 307 diff changeset	476 update_button(chicken)
298 88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	477 return False
88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	478
88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	479 chicken = self.get_outside_chicken(tile_pos)
88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	480 if chicken is None:
88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	481 building = self.get_building(tile_pos)
378 71f5897ac5ef Fences are now buildings, with appropriate (but ugly) UI changes. Jeremy Thurgood <firxen@gmail.com> parents: 361 diff changeset	482 if not (building and building.ABODE):
298 88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	483 return
88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	484 # Bounce through open dialog once more
88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	485 self.open_building_dialog(building, do_equip)
88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	486 else:
88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	487 do_equip(chicken)
109 48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	488
65 7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	489 def sell_building(self, tile_pos):
105 7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	490 building = self.get_building(tile_pos)
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	491 if building is None:
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	492 return
172 f7f29f1d434b Don't allow occupied buildings to be sold (dialog can probably be dropped once buildings show their number of occupants). Simon Cross <hodgestar@gmail.com> parents: 170 diff changeset	493 if list(building.occupants()):
f7f29f1d434b Don't allow occupied buildings to be sold (dialog can probably be dropped once buildings show their number of occupants). Simon Cross <hodgestar@gmail.com> parents: 170 diff changeset	494 warning = gui.Button("Occupied buildings may not be sold.")
f7f29f1d434b Don't allow occupied buildings to be sold (dialog can probably be dropped once buildings show their number of occupants). Simon Cross <hodgestar@gmail.com> parents: 170 diff changeset	495 self.open_dialog(warning)
f7f29f1d434b Don't allow occupied buildings to be sold (dialog can probably be dropped once buildings show their number of occupants). Simon Cross <hodgestar@gmail.com> parents: 170 diff changeset	496 return
428 a356e57529ea buildings cost wood Adrianna Pińska <adrianna.pinska@gmail.com> parents: 425 diff changeset	497 self.add_wood(building.sell_price())
105 7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	498 building.remove(self.tv)
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	499 self.remove_building(building)
65 7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	500
378 71f5897ac5ef Fences are now buildings, with appropriate (but ugly) UI changes. Jeremy Thurgood <firxen@gmail.com> parents: 361 diff changeset	501 def repair_building(self, tile_pos):
71f5897ac5ef Fences are now buildings, with appropriate (but ugly) UI changes. Jeremy Thurgood <firxen@gmail.com> parents: 361 diff changeset	502 building = self.get_building(tile_pos)
71f5897ac5ef Fences are now buildings, with appropriate (but ugly) UI changes. Jeremy Thurgood <firxen@gmail.com> parents: 361 diff changeset	503 if not (building and building.broken()):
71f5897ac5ef Fences are now buildings, with appropriate (but ugly) UI changes. Jeremy Thurgood <firxen@gmail.com> parents: 361 diff changeset	504 return
428 a356e57529ea buildings cost wood Adrianna Pińska <adrianna.pinska@gmail.com> parents: 425 diff changeset	505 if self.wood < building.repair_price():
a356e57529ea buildings cost wood Adrianna Pińska <adrianna.pinska@gmail.com> parents: 425 diff changeset	506 return
a356e57529ea buildings cost wood Adrianna Pińska <adrianna.pinska@gmail.com> parents: 425 diff changeset	507 self.add_wood(-building.repair_price())
378 71f5897ac5ef Fences are now buildings, with appropriate (but ugly) UI changes. Jeremy Thurgood <firxen@gmail.com> parents: 361 diff changeset	508 building.repair(self.tv)
71f5897ac5ef Fences are now buildings, with appropriate (but ugly) UI changes. Jeremy Thurgood <firxen@gmail.com> parents: 361 diff changeset	509
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	510 def sell_equipment(self, tile_pos):
302 01c1682dc250 Mostly working selling equipment in buildings Neil Muller <drnlmuller@gmail.com> parents: 298 diff changeset	511 x, y = 0, 0
310 49c58dda8ac2 Refactor sell_callback, so sell_equipment work Neil Muller <drnlmuller@gmail.com> parents: 307 diff changeset	512 def do_sell(chicken, update_button=None):
302 01c1682dc250 Mostly working selling equipment in buildings Neil Muller <drnlmuller@gmail.com> parents: 298 diff changeset	513 if not chicken.equipment:
01c1682dc250 Mostly working selling equipment in buildings Neil Muller <drnlmuller@gmail.com> parents: 298 diff changeset	514 return
01c1682dc250 Mostly working selling equipment in buildings Neil Muller <drnlmuller@gmail.com> parents: 298 diff changeset	515 elif len(chicken.equipment) == 1:
01c1682dc250 Mostly working selling equipment in buildings Neil Muller <drnlmuller@gmail.com> parents: 298 diff changeset	516 item = chicken.equipment[0]
01c1682dc250 Mostly working selling equipment in buildings Neil Muller <drnlmuller@gmail.com> parents: 298 diff changeset	517 self.add_cash(item.sell_price())
01c1682dc250 Mostly working selling equipment in buildings Neil Muller <drnlmuller@gmail.com> parents: 298 diff changeset	518 chicken.unequip(item)
310 49c58dda8ac2 Refactor sell_callback, so sell_equipment work Neil Muller <drnlmuller@gmail.com> parents: 307 diff changeset	519 if update_button:
49c58dda8ac2 Refactor sell_callback, so sell_equipment work Neil Muller <drnlmuller@gmail.com> parents: 307 diff changeset	520 update_button(chicken)
302 01c1682dc250 Mostly working selling equipment in buildings Neil Muller <drnlmuller@gmail.com> parents: 298 diff changeset	521 else:
310 49c58dda8ac2 Refactor sell_callback, so sell_equipment work Neil Muller <drnlmuller@gmail.com> parents: 307 diff changeset	522 self.open_equipment_dialog(chicken, x, y, update_button)
302 01c1682dc250 Mostly working selling equipment in buildings Neil Muller <drnlmuller@gmail.com> parents: 298 diff changeset	523 return False
01c1682dc250 Mostly working selling equipment in buildings Neil Muller <drnlmuller@gmail.com> parents: 298 diff changeset	524
166 4aa800354b7c Rename get_chicken to get_outside_chicken. Simon Cross <hodgestar@gmail.com> parents: 165 diff changeset	525 chicken = self.get_outside_chicken(tile_pos)
302 01c1682dc250 Mostly working selling equipment in buildings Neil Muller <drnlmuller@gmail.com> parents: 298 diff changeset	526 if chicken is not None:
01c1682dc250 Mostly working selling equipment in buildings Neil Muller <drnlmuller@gmail.com> parents: 298 diff changeset	527 do_sell(chicken)
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	528 else:
302 01c1682dc250 Mostly working selling equipment in buildings Neil Muller <drnlmuller@gmail.com> parents: 298 diff changeset	529 building = self.get_building(tile_pos)
01c1682dc250 Mostly working selling equipment in buildings Neil Muller <drnlmuller@gmail.com> parents: 298 diff changeset	530 if building is None:
01c1682dc250 Mostly working selling equipment in buildings Neil Muller <drnlmuller@gmail.com> parents: 298 diff changeset	531 return
01c1682dc250 Mostly working selling equipment in buildings Neil Muller <drnlmuller@gmail.com> parents: 298 diff changeset	532 x, y = 50, 0
01c1682dc250 Mostly working selling equipment in buildings Neil Muller <drnlmuller@gmail.com> parents: 298 diff changeset	533 self.open_building_dialog(building, do_sell)
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	534
310 49c58dda8ac2 Refactor sell_callback, so sell_equipment work Neil Muller <drnlmuller@gmail.com> parents: 307 diff changeset	535 def open_equipment_dialog(self, chicken, x, y, update_button=None):
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	536 tbl = gui.Table()
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	537
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	538 def sell_item(item, button):
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	539 """Select item of equipment."""
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	540 self.add_cash(item.sell_price())
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	541 chicken.unequip(item)
310 49c58dda8ac2 Refactor sell_callback, so sell_equipment work Neil Muller <drnlmuller@gmail.com> parents: 307 diff changeset	542 if update_button:
49c58dda8ac2 Refactor sell_callback, so sell_equipment work Neil Muller <drnlmuller@gmail.com> parents: 307 diff changeset	543 update_button(chicken)
169 946f09ed37cd Make equipment dialog close after selecting an item to sell. Simon Cross <hodgestar@gmail.com> parents: 168 diff changeset	544 self.disp.close(dialog)
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	545
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	546 kwargs = { 'style': { 'padding_left': 10, 'padding_bottom': 10 }}
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	547
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	548 tbl.tr()
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	549 tbl.td(gui.Button("Sell ... "), align=-1, **kwargs)
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	550
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	551 for item in chicken.equipment:
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	552 tbl.tr()
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	553 button = gui.Button(item.name().title())
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	554 button.connect(gui.CLICK, sell_item, item, button)
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	555 tbl.td(button, align=1, **kwargs)
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	556
302 01c1682dc250 Mostly working selling equipment in buildings Neil Muller <drnlmuller@gmail.com> parents: 298 diff changeset	557 dialog = self.open_dialog(tbl, x=x, y=y)
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	558
14 d7f295c06a4b Split gameboard screen. Jeremy Thurgood <firxen@gmail.com> parents: 12 diff changeset	559 def event(self, e):
262 d508248041ff avoid passing events in twice Neil Muller <drnlmuller@gmail.com> parents: 258 diff changeset	560 if e.type == KEYDOWN and e.key in [K_UP, K_DOWN, K_LEFT, K_RIGHT]:
39 ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	561 if e.key == K_UP:
433 8643893635e7 Seperate toolbar and gameboard Neil Muller <drnlmuller@gmail.com> parents: 428 diff changeset	562 self.tvw.move_view(0, -constants.TILE_DIMENSIONS[1])
39 ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	563 if e.key == K_DOWN:
433 8643893635e7 Seperate toolbar and gameboard Neil Muller <drnlmuller@gmail.com> parents: 428 diff changeset	564 self.tvw.move_view(0, constants.TILE_DIMENSIONS[1])
39 ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	565 if e.key == K_LEFT:
433 8643893635e7 Seperate toolbar and gameboard Neil Muller <drnlmuller@gmail.com> parents: 428 diff changeset	566 self.tvw.move_view(-constants.TILE_DIMENSIONS[0], 0)
39 ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	567 if e.key == K_RIGHT:
433 8643893635e7 Seperate toolbar and gameboard Neil Muller <drnlmuller@gmail.com> parents: 428 diff changeset	568 self.tvw.move_view(constants.TILE_DIMENSIONS[0], 0)
262 d508248041ff avoid passing events in twice Neil Muller <drnlmuller@gmail.com> parents: 258 diff changeset	569 return True
d508248041ff avoid passing events in twice Neil Muller <drnlmuller@gmail.com> parents: 258 diff changeset	570 return False
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: 24 diff changeset	571
139 1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	572 def advance_day(self):
1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	573 self.days += 1
392 bb75979b58e6 Move game_over logic from gameboard to level, for later reworking Neil Muller <drnlmuller@gmail.com> parents: 389 diff changeset	574 if self.level.is_last_day(self.days):
345 279974cc0698 Only set color of days left to red when there is only one day left. Simon Cross <hodgestar@gmail.com> parents: 341 diff changeset	575 self.toolbar.day_counter.style.color = (255, 0, 0)
346 6baf8b5beb5c Remove the "constant" constant Neil Muller <drnlmuller@gmail.com> parents: 345 diff changeset	576 self.toolbar.update_day_counter("%s/%s" % (self.days,
392 bb75979b58e6 Move game_over logic from gameboard to level, for later reworking Neil Muller <drnlmuller@gmail.com> parents: 389 diff changeset	577 self.level.get_max_turns()))
139 1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	578
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: 24 diff changeset	579 def clear_foxes(self):
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	580 for fox in self.foxes.copy():
80 ad9d1bc7ef0c Kill foxes that don't reach safety Neil Muller <drnlmuller@gmail.com> parents: 79 diff changeset	581 # Any foxes that didn't make it to the woods are automatically
ad9d1bc7ef0c Kill foxes that don't reach safety Neil Muller <drnlmuller@gmail.com> parents: 79 diff changeset	582 # killed
395 2d0ff46118e2 Basic support for z coordinate Neil Muller <drnlmuller@gmail.com> parents: 392 diff changeset	583 if self.in_bounds(fox.pos) and \
2d0ff46118e2 Basic support for z coordinate Neil Muller <drnlmuller@gmail.com> parents: 392 diff changeset	584 self.tv.get(fox.pos.to_tile_tuple()) != self.WOODLAND:
84 5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	585 self.kill_fox(fox)
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	586 else:
397 532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	587 self.remove_fox(fox)
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	588 self.foxes = set() # Remove all the foxes
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: 24 diff changeset	589
425 1d0cc37b4e14 Add method for clearing all chickens (will be useful later). Cache animal positions only just before night starts. Range-check position before adding it to the cache. Simon Cross <hodgestar@gmail.com> parents: 424 diff changeset	590 def clear_chickens(self):
1d0cc37b4e14 Add method for clearing all chickens (will be useful later). Cache animal positions only just before night starts. Range-check position before adding it to the cache. Simon Cross <hodgestar@gmail.com> parents: 424 diff changeset	591 for chicken in self.chickens.copy():
1d0cc37b4e14 Add method for clearing all chickens (will be useful later). Cache animal positions only just before night starts. Range-check position before adding it to the cache. Simon Cross <hodgestar@gmail.com> parents: 424 diff changeset	592 self.remove_chicken(chicken)
1d0cc37b4e14 Add method for clearing all chickens (will be useful later). Cache animal positions only just before night starts. Range-check position before adding it to the cache. Simon Cross <hodgestar@gmail.com> parents: 424 diff changeset	593
444 feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	594 def clear_buildings(self):
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	595 for building in self.buildings.copy():
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	596 self.remove_building(building)
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	597
396 19e583e5cdc0 Refactor for further move work Neil Muller <drnlmuller@gmail.com> parents: 395 diff changeset	598 def do_night_step(self):
19e583e5cdc0 Refactor for further move work Neil Muller <drnlmuller@gmail.com> parents: 395 diff changeset	599 """Handle the events of the night.
19e583e5cdc0 Refactor for further move work Neil Muller <drnlmuller@gmail.com> parents: 395 diff changeset	600
122 d2b19131d537 Don't continue the night if we're not doing anything anymore Neil Muller <drnlmuller@gmail.com> parents: 119 diff changeset	601 We return True if there are no more foxes to move or all the
d2b19131d537 Don't continue the night if we're not doing anything anymore Neil Muller <drnlmuller@gmail.com> parents: 119 diff changeset	602 foxes are safely back. This end's the night"""
d2b19131d537 Don't continue the night if we're not doing anything anymore Neil Muller <drnlmuller@gmail.com> parents: 119 diff changeset	603 if not self.foxes:
d2b19131d537 Don't continue the night if we're not doing anything anymore Neil Muller <drnlmuller@gmail.com> parents: 119 diff changeset	604 return True
396 19e583e5cdc0 Refactor for further move work Neil Muller <drnlmuller@gmail.com> parents: 395 diff changeset	605 # Move all the foxes
19e583e5cdc0 Refactor for further move work Neil Muller <drnlmuller@gmail.com> parents: 395 diff changeset	606 over = self.foxes_move()
19e583e5cdc0 Refactor for further move work Neil Muller <drnlmuller@gmail.com> parents: 395 diff changeset	607 if not over:
19e583e5cdc0 Refactor for further move work Neil Muller <drnlmuller@gmail.com> parents: 395 diff changeset	608 self.foxes_attack()
19e583e5cdc0 Refactor for further move work Neil Muller <drnlmuller@gmail.com> parents: 395 diff changeset	609 self.chickens_attack()
19e583e5cdc0 Refactor for further move work Neil Muller <drnlmuller@gmail.com> parents: 395 diff changeset	610 return over
19e583e5cdc0 Refactor for further move work Neil Muller <drnlmuller@gmail.com> parents: 395 diff changeset	611
401 7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 400 diff changeset	612 def _cache_animal_positions(self):
399 3294929223bd Cache fox positions to avoid a repeated loop Neil Muller <drnlmuller@gmail.com> parents: 397 diff changeset	613 """Cache the current set of fox positions for the avoiding checks"""
3294929223bd Cache fox positions to avoid a repeated loop Neil Muller <drnlmuller@gmail.com> parents: 397 diff changeset	614 w, h = self.tv.size
401 7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 400 diff changeset	615 self._pos_cache['fox'] = [[[None for z in range(5)] for y in range(h)]
399 3294929223bd Cache fox positions to avoid a repeated loop Neil Muller <drnlmuller@gmail.com> parents: 397 diff changeset	616 for x in range(w)] # NB: Assumes z in [0, 4]
401 7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 400 diff changeset	617 self._pos_cache['chicken'] = [[[None for z in range(5)] for y in range(h)]
7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 400 diff changeset	618 for x in range(w)]
399 3294929223bd Cache fox positions to avoid a repeated loop Neil Muller <drnlmuller@gmail.com> parents: 397 diff changeset	619 for fox in self.foxes:
401 7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 400 diff changeset	620 self._add_to_pos_cache(fox, 'fox')
7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 400 diff changeset	621 for chick in self.chickens:
7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 400 diff changeset	622 self._add_to_pos_cache(chick, 'chicken')
7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 400 diff changeset	623
7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 400 diff changeset	624 def _add_to_pos_cache(self, animal, cache_type):
425 1d0cc37b4e14 Add method for clearing all chickens (will be useful later). Cache animal positions only just before night starts. Range-check position before adding it to the cache. Simon Cross <hodgestar@gmail.com> parents: 424 diff changeset	625 if self.in_bounds(animal.pos):
1d0cc37b4e14 Add method for clearing all chickens (will be useful later). Cache animal positions only just before night starts. Range-check position before adding it to the cache. Simon Cross <hodgestar@gmail.com> parents: 424 diff changeset	626 self._pos_cache[cache_type][animal.pos.x][animal.pos.y][animal.pos.z] = animal
399 3294929223bd Cache fox positions to avoid a repeated loop Neil Muller <drnlmuller@gmail.com> parents: 397 diff changeset	627
401 7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 400 diff changeset	628 def _update_pos_cache(self, old_pos, animal, cache_type):
405 ae3cee7a1337 Fix crash due to invalid cache Neil Muller <drnlmuller@gmail.com> parents: 403 diff changeset	629 if self.in_bounds(old_pos) and self._pos_cache[cache_type]:
401 7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 400 diff changeset	630 self._pos_cache[cache_type][old_pos.x][old_pos.y][old_pos.z] = None
7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 400 diff changeset	631 if animal:
7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 400 diff changeset	632 pos = animal.pos
7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 400 diff changeset	633 if self.in_bounds(pos):
7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 400 diff changeset	634 self._pos_cache[cache_type][pos.x][pos.y][pos.z] = animal
399 3294929223bd Cache fox positions to avoid a repeated loop Neil Muller <drnlmuller@gmail.com> parents: 397 diff changeset	635
401 7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 400 diff changeset	636 def get_animal_at_pos(self, pos, cache_type):
7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 400 diff changeset	637 if not self._pos_cache[cache_type]:
7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 400 diff changeset	638 return None # We don't maintain the cache during the day
399 3294929223bd Cache fox positions to avoid a repeated loop Neil Muller <drnlmuller@gmail.com> parents: 397 diff changeset	639 if self.in_bounds(pos):
401 7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 400 diff changeset	640 return self._pos_cache[cache_type][pos.x][pos.y][pos.z]
7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 400 diff changeset	641 return None
399 3294929223bd Cache fox positions to avoid a repeated loop Neil Muller <drnlmuller@gmail.com> parents: 397 diff changeset	642
422 ab4fc3fe0f96 chickens scatter; chop wood Adrianna Pińska <adrianna.pinska@gmail.com> parents: 421 diff changeset	643 def chickens_scatter(self):
ab4fc3fe0f96 chickens scatter; chop wood Adrianna Pińska <adrianna.pinska@gmail.com> parents: 421 diff changeset	644 """Chickens outside move around randomly a bit"""
ab4fc3fe0f96 chickens scatter; chop wood Adrianna Pińska <adrianna.pinska@gmail.com> parents: 421 diff changeset	645 for chicken in [chick for chick in self.chickens if chick.outside()]:
ab4fc3fe0f96 chickens scatter; chop wood Adrianna Pińska <adrianna.pinska@gmail.com> parents: 421 diff changeset	646 old_pos = chicken.pos
ab4fc3fe0f96 chickens scatter; chop wood Adrianna Pińska <adrianna.pinska@gmail.com> parents: 421 diff changeset	647 chicken.move(self)
ab4fc3fe0f96 chickens scatter; chop wood Adrianna Pińska <adrianna.pinska@gmail.com> parents: 421 diff changeset	648 if chicken.pos != old_pos:
ab4fc3fe0f96 chickens scatter; chop wood Adrianna Pińska <adrianna.pinska@gmail.com> parents: 421 diff changeset	649 self._update_pos_cache(old_pos, chicken, 'chicken')
ab4fc3fe0f96 chickens scatter; chop wood Adrianna Pińska <adrianna.pinska@gmail.com> parents: 421 diff changeset	650
ab4fc3fe0f96 chickens scatter; chop wood Adrianna Pińska <adrianna.pinska@gmail.com> parents: 421 diff changeset	651 def chickens_chop_wood(self):
ab4fc3fe0f96 chickens scatter; chop wood Adrianna Pińska <adrianna.pinska@gmail.com> parents: 421 diff changeset	652 """Chickens with axes chop down trees near them"""
ab4fc3fe0f96 chickens scatter; chop wood Adrianna Pińska <adrianna.pinska@gmail.com> parents: 421 diff changeset	653 for chicken in [chick for chick in self.chickens if chick.outside()]:
ab4fc3fe0f96 chickens scatter; chop wood Adrianna Pińska <adrianna.pinska@gmail.com> parents: 421 diff changeset	654 chicken.chop(self)
ab4fc3fe0f96 chickens scatter; chop wood Adrianna Pińska <adrianna.pinska@gmail.com> parents: 421 diff changeset	655
396 19e583e5cdc0 Refactor for further move work Neil Muller <drnlmuller@gmail.com> parents: 395 diff changeset	656 def foxes_move(self):
122 d2b19131d537 Don't continue the night if we're not doing anything anymore Neil Muller <drnlmuller@gmail.com> parents: 119 diff changeset	657 over = True
29 2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	658 for fox in self.foxes:
399 3294929223bd Cache fox positions to avoid a repeated loop Neil Muller <drnlmuller@gmail.com> parents: 397 diff changeset	659 old_pos = fox.pos
29 2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	660 fox.move(self)
122 d2b19131d537 Don't continue the night if we're not doing anything anymore Neil Muller <drnlmuller@gmail.com> parents: 119 diff changeset	661 if not fox.safe:
d2b19131d537 Don't continue the night if we're not doing anything anymore Neil Muller <drnlmuller@gmail.com> parents: 119 diff changeset	662 over = False
399 3294929223bd Cache fox positions to avoid a repeated loop Neil Muller <drnlmuller@gmail.com> parents: 397 diff changeset	663 if fox.pos != old_pos:
401 7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 400 diff changeset	664 self._update_pos_cache(old_pos, fox, 'fox')
396 19e583e5cdc0 Refactor for further move work Neil Muller <drnlmuller@gmail.com> parents: 395 diff changeset	665 return over
19e583e5cdc0 Refactor for further move work Neil Muller <drnlmuller@gmail.com> parents: 395 diff changeset	666
19e583e5cdc0 Refactor for further move work Neil Muller <drnlmuller@gmail.com> parents: 395 diff changeset	667 def foxes_attack(self):
19e583e5cdc0 Refactor for further move work Neil Muller <drnlmuller@gmail.com> parents: 395 diff changeset	668 for fox in self.foxes:
19e583e5cdc0 Refactor for further move work Neil Muller <drnlmuller@gmail.com> parents: 395 diff changeset	669 fox.attack(self)
19e583e5cdc0 Refactor for further move work Neil Muller <drnlmuller@gmail.com> parents: 395 diff changeset	670
19e583e5cdc0 Refactor for further move work Neil Muller <drnlmuller@gmail.com> parents: 395 diff changeset	671 def chickens_attack(self):
84 5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	672 for chicken in self.chickens:
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	673 chicken.attack(self)
29 2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	674
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: 24 diff changeset	675 def add_chicken(self, chicken):
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	676 self.chickens.add(chicken)
115 2b2007e231da Start of dialog for placing chickens in buildings. Remove chicken in hen house bug by not allowing chickens in hen houses. Simon Cross <hodgestar@gmail.com> parents: 109 diff changeset	677 if chicken.outside():
2b2007e231da Start of dialog for placing chickens in buildings. Remove chicken in hen house bug by not allowing chickens in hen houses. Simon Cross <hodgestar@gmail.com> parents: 109 diff changeset	678 self.tv.sprites.append(chicken)
424 fbef17cab632 Use fully rendered map in gameboard choosing screen Neil Muller <drnlmuller@gmail.com> parents: 422 diff changeset	679 if self.disp:
fbef17cab632 Use fully rendered map in gameboard choosing screen Neil Muller <drnlmuller@gmail.com> parents: 422 diff changeset	680 self.toolbar.update_chicken_counter(len(self.chickens))
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: 24 diff changeset	681
6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: 24 diff changeset	682 def add_fox(self, fox):
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	683 self.foxes.add(fox)
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: 24 diff changeset	684 self.tv.sprites.append(fox)
29 2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	685
64 99fbb652ce8d Refactor buildings so that new ones can be added just by adding a class to buildings.py. Simon Cross <hodgestar@gmail.com> parents: 60 diff changeset	686 def add_building(self, building):
444 feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	687 self.buildings.add(building)
381 7a58dadfd251 little cleanups, every sprite in its proper layer. Jeremy Thurgood <firxen@gmail.com> parents: 380 diff changeset	688 self.tv.sprites.append(building, layer='buildings')
60 e2631c8e2cd6 Implement guard towers (with temporary sprite PNG). Simon Cross <hodgestar@gmail.com> parents: 57 diff changeset	689
419 d110d55c8449 Move hatching logic into chickens. Jeremy Thurgood <firxen@gmail.com> parents: 414 diff changeset	690 def place_hatched_chicken(self, new_chick, building):
d110d55c8449 Move hatching logic into chickens. Jeremy Thurgood <firxen@gmail.com> parents: 414 diff changeset	691 try:
d110d55c8449 Move hatching logic into chickens. Jeremy Thurgood <firxen@gmail.com> parents: 414 diff changeset	692 building.add_occupant(new_chick)
d110d55c8449 Move hatching logic into chickens. Jeremy Thurgood <firxen@gmail.com> parents: 414 diff changeset	693 self.add_chicken(new_chick)
d110d55c8449 Move hatching logic into chickens. Jeremy Thurgood <firxen@gmail.com> parents: 414 diff changeset	694 new_chick.equip(equipment.Nest())
d110d55c8449 Move hatching logic into chickens. Jeremy Thurgood <firxen@gmail.com> parents: 414 diff changeset	695 except buildings.BuildingFullError:
d110d55c8449 Move hatching logic into chickens. Jeremy Thurgood <firxen@gmail.com> parents: 414 diff changeset	696 # No space in the hen house, look nearby
d110d55c8449 Move hatching logic into chickens. Jeremy Thurgood <firxen@gmail.com> parents: 414 diff changeset	697 for tile_pos in building.adjacent_tiles():
d110d55c8449 Move hatching logic into chickens. Jeremy Thurgood <firxen@gmail.com> parents: 414 diff changeset	698 if self.tv.get(tile_pos) != self.GRASSLAND:
d110d55c8449 Move hatching logic into chickens. Jeremy Thurgood <firxen@gmail.com> parents: 414 diff changeset	699 continue
d110d55c8449 Move hatching logic into chickens. Jeremy Thurgood <firxen@gmail.com> parents: 414 diff changeset	700 if self.get_outside_chicken(tile_pos) is None:
d110d55c8449 Move hatching logic into chickens. Jeremy Thurgood <firxen@gmail.com> parents: 414 diff changeset	701 self.add_chicken(new_chick)
d110d55c8449 Move hatching logic into chickens. Jeremy Thurgood <firxen@gmail.com> parents: 414 diff changeset	702 self.relocate_animal(new_chick, tile_pos=tile_pos)
d110d55c8449 Move hatching logic into chickens. Jeremy Thurgood <firxen@gmail.com> parents: 414 diff changeset	703 break
d110d55c8449 Move hatching logic into chickens. Jeremy Thurgood <firxen@gmail.com> parents: 414 diff changeset	704 # if there isn't a space for the
d110d55c8449 Move hatching logic into chickens. Jeremy Thurgood <firxen@gmail.com> parents: 414 diff changeset	705 # new chick it dies. :/ Farm life
d110d55c8449 Move hatching logic into chickens. Jeremy Thurgood <firxen@gmail.com> parents: 414 diff changeset	706 # is cruel.
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	707
84 5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	708 def kill_fox(self, fox):
251 844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 247 diff changeset	709 self.killed_foxes += 1
844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 247 diff changeset	710 self.toolbar.update_fox_counter(self.killed_foxes)
389 463802281182 Add basic level support (level choosing needs work) Neil Muller <drnlmuller@gmail.com> parents: 382 diff changeset	711 self.add_cash(self.level.sell_price_dead_fox)
401 7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 400 diff changeset	712 self._update_pos_cache(fox.pos, None, 'fox')
251 844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 247 diff changeset	713 self.remove_fox(fox)
84 5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	714
29 2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	715 def remove_fox(self, fox):
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	716 self.foxes.discard(fox)
397 532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	717 if fox.building:
532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	718 fox.building.remove_predator(fox)
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	719 if fox in self.tv.sprites:
29 2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	720 self.tv.sprites.remove(fox)
2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	721
2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	722 def remove_chicken(self, chick):
215 85a5299caf4a bugfix: deselect eaten chickens Adrianna Pińska <adrianna.pinska@gmail.com> parents: 213 diff changeset	723 if chick is self.animal_to_place:
85a5299caf4a bugfix: deselect eaten chickens Adrianna Pińska <adrianna.pinska@gmail.com> parents: 213 diff changeset	724 self.select_animal_to_place(None)
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	725 self.chickens.discard(chick)
243 4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	726 self.eggs -= chick.get_num_eggs()
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	727 self.toolbar.update_egg_counter(self.eggs)
118 2c76ed47fc44 Remove chicken respawn at day start. Handle eaten chickens in henhouses better Neil Muller <drnlmuller@gmail.com> parents: 116 diff changeset	728 if chick.abode:
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	729 chick.abode.clear_occupant()
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	730 self.toolbar.update_chicken_counter(len(self.chickens))
144 a9b800b4175e Add define for henhouses & egg laying. Neil Muller <drnlmuller@gmail.com> parents: 139 diff changeset	731 if chick in self.tv.sprites and chick.outside():
a9b800b4175e Add define for henhouses & egg laying. Neil Muller <drnlmuller@gmail.com> parents: 139 diff changeset	732 self.tv.sprites.remove(chick)
401 7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 400 diff changeset	733 self._update_pos_cache(chick.pos, None, 'chicken')
40 678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	734
65 7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	735 def remove_building(self, building):
7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	736 if building in self.buildings:
444 feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	737 self.buildings.discard(building)
381 7a58dadfd251 little cleanups, every sprite in its proper layer. Jeremy Thurgood <firxen@gmail.com> parents: 380 diff changeset	738 self.tv.sprites.remove(building, layer='buildings')
65 7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	739
40 678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	740 def add_cash(self, amount):
678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	741 self.cash += amount
678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	742 self.toolbar.update_cash_counter(self.cash)
67 9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	743
422 ab4fc3fe0f96 chickens scatter; chop wood Adrianna Pińska <adrianna.pinska@gmail.com> parents: 421 diff changeset	744 def add_wood(self, planks):
ab4fc3fe0f96 chickens scatter; chop wood Adrianna Pińska <adrianna.pinska@gmail.com> parents: 421 diff changeset	745 self.wood += planks
ab4fc3fe0f96 chickens scatter; chop wood Adrianna Pińska <adrianna.pinska@gmail.com> parents: 421 diff changeset	746 self.toolbar.update_wood_counter(self.wood)
ab4fc3fe0f96 chickens scatter; chop wood Adrianna Pińska <adrianna.pinska@gmail.com> parents: 421 diff changeset	747
408 02a6de5629d6 Levels can include starting equipment Neil Muller <drnlmuller@gmail.com> parents: 405 diff changeset	748 def add_start_chickens(self, _map, tile, value):
382 e89e6ad011ac Use code layer to place chickens Neil Muller <drnlmuller@gmail.com> parents: 381 diff changeset	749 """Add chickens as specified by the code layer"""
e89e6ad011ac Use code layer to place chickens Neil Muller <drnlmuller@gmail.com> parents: 381 diff changeset	750 chick = animal.Chicken((tile.tx, tile.ty))
408 02a6de5629d6 Levels can include starting equipment Neil Muller <drnlmuller@gmail.com> parents: 405 diff changeset	751 for equip_cls in equipment.EQUIP_MAP[value]:
02a6de5629d6 Levels can include starting equipment Neil Muller <drnlmuller@gmail.com> parents: 405 diff changeset	752 item = equip_cls()
02a6de5629d6 Levels can include starting equipment Neil Muller <drnlmuller@gmail.com> parents: 405 diff changeset	753 chick.equip(item)
382 e89e6ad011ac Use code layer to place chickens Neil Muller <drnlmuller@gmail.com> parents: 381 diff changeset	754 self.add_chicken(chick)
69 18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	755
241 1a7000c8211c Demolition foxes, including better fox selection. Jeremy Thurgood <firxen@gmail.com> parents: 239 diff changeset	756 def _choose_fox(self, (x, y)):
389 463802281182 Add basic level support (level choosing needs work) Neil Muller <drnlmuller@gmail.com> parents: 382 diff changeset	757 fox_cls = misc.WeightedSelection(self.level.fox_weightings).choose()
241 1a7000c8211c Demolition foxes, including better fox selection. Jeremy Thurgood <firxen@gmail.com> parents: 239 diff changeset	758 return fox_cls((x, y))
1a7000c8211c Demolition foxes, including better fox selection. Jeremy Thurgood <firxen@gmail.com> parents: 239 diff changeset	759
69 18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	760 def spawn_foxes(self):
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	761 """The foxes come at night, and this is where they come from."""
73 f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	762 # Foxes spawn just outside the map
69 18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	763 x, y = 0, 0
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	764 width, height = self.tv.size
389 463802281182 Add basic level support (level choosing needs work) Neil Muller <drnlmuller@gmail.com> parents: 382 diff changeset	765 min_foxes = max(self.level.min_foxes, (self.days+3)/2) # always more than one fox
323 978efd39a099 Limit maximum numbe of foxes generated Neil Muller <drnlmuller@gmail.com> parents: 320 diff changeset	766 new_foxes = min(random.randint(min_foxes, min_foxes*2), self.max_foxes)
69 18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	767 while len(self.foxes) < new_foxes:
73 f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	768 side = random.randint(0, 3)
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	769 if side == 0:
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	770 # top
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	771 y = -1
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	772 x = random.randint(-1, width)
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	773 elif side == 1:
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	774 # bottom
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	775 y = height
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	776 x = random.randint(-1, width)
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	777 elif side == 2:
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	778 # left
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	779 x = -1
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	780 y = random.randint(-1, height)
69 18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	781 else:
73 f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	782 x = width
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	783 y = random.randint(-1, height)
403 c7cfa230f5d4 Remove board size restriction on number of foxes Neil Muller <drnlmuller@gmail.com> parents: 401 diff changeset	784 self.add_fox(self._choose_fox((x, y)))
69 18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	785
67 9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	786 def fix_buildings(self):
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	787 """Go through the level map looking for buildings that haven't
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	788 been added to self.buildings and adding them.
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	789
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	790 Where partial buildings exist (i.e. places where the building
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	791 cannot fit on the available tiles) the building is added anyway
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	792 to the top left corner.
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	793
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	794 Could be a lot faster.
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	795 """
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	796 tile_to_building = dict((b.TILE_NO, b) for b in buildings.BUILDINGS)
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	797
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	798 w, h = self.tv.size
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	799 for x in xrange(w):
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	800 for y in xrange(h):
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	801 tile_pos = (x, y)
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	802 tile_no = self.tv.get(tile_pos)
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	803 if tile_no not in tile_to_building:
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	804 continue
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	805
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	806 covered = False
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	807 for building in self.buildings:
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	808 if building.covers(tile_pos):
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	809 covered = True
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	810 break
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	811
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	812 if covered:
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	813 continue
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	814
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	815 building_cls = tile_to_building[tile_no]
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	816 building = building_cls(tile_pos)
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	817 building.remove(self.tv)
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	818 building.place(self.tv)
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	819 self.add_building(building)
139 1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	820
307 bf1df0902883 three game modes: fortnight, quarter, fox extinction Adrianna Pińska <adrianna.pinska@gmail.com> parents: 305 diff changeset	821 def trees_left(self):
bf1df0902883 three game modes: fortnight, quarter, fox extinction Adrianna Pińska <adrianna.pinska@gmail.com> parents: 305 diff changeset	822 width, height = self.tv.size
bf1df0902883 three game modes: fortnight, quarter, fox extinction Adrianna Pińska <adrianna.pinska@gmail.com> parents: 305 diff changeset	823 return len([(x,y) for x in range(width) for y in range(height) if self.tv.get((x,y)) == self.WOODLAND])
bf1df0902883 three game modes: fortnight, quarter, fox extinction Adrianna Pińska <adrianna.pinska@gmail.com> parents: 305 diff changeset	824
444 feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	825 def save_game(self):
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	826 return serializer.simplify(self)
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	827
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	828 def restore_game(self, data):
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	829 if 'refid' not in data or 'class' not in data or data['class'] != self.__class__.__name__:
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	830 import pprint
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	831 pprint.pprint(data)
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	832 print self.__class__.__name__
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	833 raise ValueError("Invalid save game.")
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	834 newself = serializer.unsimplify(data)
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	835 self.clear_chickens()
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	836 self.clear_buildings()
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	837 for chicken in newself.chickens:
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	838 self.add_chicken(chicken)
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	839 for building in newself.buildings:
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	840 self.add_building(building)
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	841 for attr in self.SIMPLIFY:
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	842 if attr in ('chickens', 'buildings'):
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	843 continue
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	844 setattr(self, attr, getattr(newself, attr))
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space). Simon Cross <hodgestar@gmail.com> parents: 434 diff changeset	845
326 89f51d513606 Add TextDialog class and use it to warn about selling your last chicken. Simon Cross <hodgestar@gmail.com> parents: 325 diff changeset	846
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken. Simon Cross <hodgestar@gmail.com> parents: 325 diff changeset	847 class TextDialog(gui.Dialog):
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken. Simon Cross <hodgestar@gmail.com> parents: 325 diff changeset	848 def __init__(self, title, text, **params):
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken. Simon Cross <hodgestar@gmail.com> parents: 325 diff changeset	849 title_label = gui.Label(title)
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken. Simon Cross <hodgestar@gmail.com> parents: 325 diff changeset	850
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken. Simon Cross <hodgestar@gmail.com> parents: 325 diff changeset	851 doc = gui.Document()
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken. Simon Cross <hodgestar@gmail.com> parents: 325 diff changeset	852
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken. Simon Cross <hodgestar@gmail.com> parents: 325 diff changeset	853 space = doc.style.font.size(" ")
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken. Simon Cross <hodgestar@gmail.com> parents: 325 diff changeset	854
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken. Simon Cross <hodgestar@gmail.com> parents: 325 diff changeset	855 for paragraph in text.split('\n\n'):
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken. Simon Cross <hodgestar@gmail.com> parents: 325 diff changeset	856 doc.block(align=-1)
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken. Simon Cross <hodgestar@gmail.com> parents: 325 diff changeset	857 for word in paragraph.split():
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken. Simon Cross <hodgestar@gmail.com> parents: 325 diff changeset	858 doc.add(gui.Label(word))
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken. Simon Cross <hodgestar@gmail.com> parents: 325 diff changeset	859 doc.space(space)
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken. Simon Cross <hodgestar@gmail.com> parents: 325 diff changeset	860 doc.br(space[1])
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken. Simon Cross <hodgestar@gmail.com> parents: 325 diff changeset	861 doc.br(space[1])
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken. Simon Cross <hodgestar@gmail.com> parents: 325 diff changeset	862
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken. Simon Cross <hodgestar@gmail.com> parents: 325 diff changeset	863 done_button = gui.Button("Close")
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken. Simon Cross <hodgestar@gmail.com> parents: 325 diff changeset	864 done_button.connect(gui.CLICK, self.close)
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken. Simon Cross <hodgestar@gmail.com> parents: 325 diff changeset	865
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken. Simon Cross <hodgestar@gmail.com> parents: 325 diff changeset	866 tbl = gui.Table()
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken. Simon Cross <hodgestar@gmail.com> parents: 325 diff changeset	867 tbl.tr()
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken. Simon Cross <hodgestar@gmail.com> parents: 325 diff changeset	868 tbl.td(doc)
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken. Simon Cross <hodgestar@gmail.com> parents: 325 diff changeset	869 tbl.tr()
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken. Simon Cross <hodgestar@gmail.com> parents: 325 diff changeset	870 tbl.td(done_button, align=1)
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken. Simon Cross <hodgestar@gmail.com> parents: 325 diff changeset	871
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken. Simon Cross <hodgestar@gmail.com> parents: 325 diff changeset	872 gui.Dialog.__init__(self, title_label, tbl, **params)
336 82a18615a0ab Ask 'Are you sure?' Neil Muller <drnlmuller@gmail.com> parents: 330 diff changeset	873
82a18615a0ab Ask 'Are you sure?' Neil Muller <drnlmuller@gmail.com> parents: 330 diff changeset	874

Mercurial > rinkhals

annotate gamelib/gameboard.py @ 447:f04a2490c35f