Mercurial > rinkhals

annotate gamelib/gameboard.py @ 561:7f037ee2a6c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Show count of selected chickens in buildings
author Neil Muller <drnlmuller@gmail.com>
date Sat, 28 Nov 2009 18:40:04 +0000
parents 50d6c68ce267
children 32b6b66e114a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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, \
489
3c9c664ccb85 selection groups
Neil Muller <drnlmuller@gmail.com>
parents: 488
diff changeset
5 K_LEFT, K_RIGHT, KMOD_SHIFT, K_0, K_1, K_2, K_3, K_4, K_5, K_6, K_7, \
548
27c09c58d89d Remove gameboard and dialog event flow hacks.
Simon Cross <hodgestar@gmail.com>
parents: 544
diff changeset
6 K_8, K_9, K_ESCAPE, K_n, K_d, KMOD_CTRL, KMOD_ALT, KEYUP
35
8f6c6a54a099 Fixed gameboard display.
Jeremy Thurgood <firxen@gmail.com>
parents: 29
diff changeset
7 from pgu import gui
9
3b045083631e Basic game board logic.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
8
24
7584453f4944 Add support for PNG tiles.
Simon Cross <hodgestar@gmail.com>
parents: 17
diff changeset
9 import tiles
79
8241386a1651 Add chicken counter
Neil Muller <drnlmuller@gmail.com>
parents: 77
diff changeset
10 import icons
40
678421bd58ee Money counter with very ugly display hack.
Jeremy Thurgood <firxen@gmail.com>
parents: 39
diff changeset
11 import constants
57
08665fa60345 Implement henhouses and henhouse adding.
Simon Cross <hodgestar@gmail.com>
parents: 54
diff changeset
12 import buildings
69
18db99fda6bd Move spawing code from engine to gameboard - seems more natural.
Neil Muller <drnlmuller@gmail.com>
parents: 68
diff changeset
13 import animal
84
5494af02a0e8 Chickens with rifles!
Jeremy Thurgood <firxen@gmail.com>
parents: 83
diff changeset
14 import equipment
94
fa8d8fc1bf5b Added some sounds
David Fraser <davidf@sjsoft.com>
parents: 92
diff changeset
15 import sound
162
fa57868123d7 Basic cursor support
Neil Muller <drnlmuller@gmail.com>
parents: 158
diff changeset
16 import cursors
186
f06010d34cd3 Add sprite cursors for building placement.
Simon Cross <hodgestar@gmail.com>
parents: 183
diff changeset
17 import sprite_cursor
241
1a7000c8211c Demolition foxes, including better fox selection.
Jeremy Thurgood <firxen@gmail.com>
parents: 239
diff changeset
18 import misc
433
8643893635e7 Seperate toolbar and gameboard
Neil Muller <drnlmuller@gmail.com>
parents: 428
diff changeset
19 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
20 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
21
35
8f6c6a54a099 Fixed gameboard display.
Jeremy Thurgood <firxen@gmail.com>
parents: 29
diff changeset
22 class VidWidget(gui.Widget):
8f6c6a54a099 Fixed gameboard display.
Jeremy Thurgood <firxen@gmail.com>
parents: 29
diff changeset
23 def __init__(self, gameboard, vid, **params):
8f6c6a54a099 Fixed gameboard display.
Jeremy Thurgood <firxen@gmail.com>
parents: 29
diff changeset
24 gui.Widget.__init__(self, **params)
8f6c6a54a099 Fixed gameboard display.
Jeremy Thurgood <firxen@gmail.com>
parents: 29
diff changeset
25 self.gameboard = gameboard
8f6c6a54a099 Fixed gameboard display.
Jeremy Thurgood <firxen@gmail.com>
parents: 29
diff changeset
26 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
27 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
28
8f6c6a54a099 Fixed gameboard display.
Jeremy Thurgood <firxen@gmail.com>
parents: 29
diff changeset
29 def paint(self, surface):
8f6c6a54a099 Fixed gameboard display.
Jeremy Thurgood <firxen@gmail.com>
parents: 29
diff changeset
30 self.vid.paint(surface)
8f6c6a54a099 Fixed gameboard display.
Jeremy Thurgood <firxen@gmail.com>
parents: 29
diff changeset
31
8f6c6a54a099 Fixed gameboard display.
Jeremy Thurgood <firxen@gmail.com>
parents: 29
diff changeset
32 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
33 return self.vid.update(surface)
35
8f6c6a54a099 Fixed gameboard display.
Jeremy Thurgood <firxen@gmail.com>
parents: 29
diff changeset
34
39
ec79aabe2bf1 Scroll game window with arrow keys.
Jeremy Thurgood <firxen@gmail.com>
parents: 37
diff changeset
35 def move_view(self, x, y):
ec79aabe2bf1 Scroll game window with arrow keys.
Jeremy Thurgood <firxen@gmail.com>
parents: 37
diff changeset
36 self.vid.view.move_ip((x, y))
ec79aabe2bf1 Scroll game window with arrow keys.
Jeremy Thurgood <firxen@gmail.com>
parents: 37
diff changeset
37
35
8f6c6a54a099 Fixed gameboard display.
Jeremy Thurgood <firxen@gmail.com>
parents: 29
diff changeset
38 def event(self, e):
8f6c6a54a099 Fixed gameboard display.
Jeremy Thurgood <firxen@gmail.com>
parents: 29
diff changeset
39 if e.type == MOUSEBUTTONDOWN:
8f6c6a54a099 Fixed gameboard display.
Jeremy Thurgood <firxen@gmail.com>
parents: 29
diff changeset
40 self.gameboard.use_tool(e)
186
f06010d34cd3 Add sprite cursors for building placement.
Simon Cross <hodgestar@gmail.com>
parents: 183
diff changeset
41 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
42 self.gameboard.update_sprite_cursor(e)
541
450de9dfa106 Move gameboard event prodding into the widgets - better matches pgu internals
Neil Muller <drnlmuller@gmail.com>
parents: 539
diff changeset
43 else:
548
27c09c58d89d Remove gameboard and dialog event flow hacks.
Simon Cross <hodgestar@gmail.com>
parents: 544
diff changeset
44 return False
35
8f6c6a54a099 Fixed gameboard display.
Jeremy Thurgood <firxen@gmail.com>
parents: 29
diff changeset
45
456
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
46
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
47 class AnimalPositionCache(object):
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
48 def __init__(self, gameboard):
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
49 self.gameboard = gameboard
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
50 self.clear()
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
51
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
52 def clear(self):
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
53 self._cache = {'chicken': {}, 'fox': {}}
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
54
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
55 def _in_bounds(self, pos):
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
56 return self.gameboard.in_bounds(pos)
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
57
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
58 def add(self, animal, animal_type):
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
59 if animal and self._in_bounds(animal.pos):
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
60 self._cache[animal_type][animal.pos] = animal
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
61
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
62 def remove(self, pos, animal_type):
457
fc648da2334c Fix position cache removal, slightly optimise chicken range check.
Jeremy Thurgood <firxen@gmail.com>
parents: 456
diff changeset
63 if pos in self._cache[animal_type]:
456
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
64 del self._cache[animal_type][pos]
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
65
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
66 def update(self, old_pos, animal, animal_type):
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
67 self.remove(old_pos, animal_type)
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
68 self.add(animal, animal_type)
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
69
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
70 def get(self, pos, animal_type):
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
71 return self._cache[animal_type].get(pos, None)
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
72
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
73
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
74 class GameBoard(serializer.Simplifiable):
9
3b045083631e Basic game board logic.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
75
66
edc15ce8fa30 Implement fence selling (a bit hackish, but fine for now).
Simon Cross <hodgestar@gmail.com>
parents: 65
diff changeset
76 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
77 FENCE = tiles.REVERSE_TILE_MAP['fence']
69
18db99fda6bd Move spawing code from engine to gameboard - seems more natural.
Neil Muller <drnlmuller@gmail.com>
parents: 68
diff changeset
78 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
79
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
80 SIMPLIFY = [
468
d5e4959cfe7a Start of support for restoring level information.
Simon Cross <hodgestar@gmail.com>
parents: 463
diff changeset
81 'level',
463
e3408c803b12 Save and restore tilevid when loading / saving games.
Simon Cross <hodgestar@gmail.com>
parents: 462
diff changeset
82 'tv',
468
d5e4959cfe7a Start of support for restoring level information.
Simon Cross <hodgestar@gmail.com>
parents: 463
diff changeset
83 'max_foxes',
504
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
84 #'selected_tool',
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
85 #'sprite_cursor',
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
86 'selected_chickens',
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
87 'stored_selections',
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
88 'chickens',
504
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
89 'foxes',
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
90 'buildings',
504
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
91 #'_pos_cache',
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
92 '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
93 '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
94 '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
95 '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
96 '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
97 '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
98 ]
feb9b7a23ef2 Support for saving and loading games (toolbar entries commented out for lack of space).
Simon Cross <hodgestar@gmail.com>
parents: 434
diff changeset
99
389
463802281182 Add basic level support (level choosing needs work)
Neil Muller <drnlmuller@gmail.com>
parents: 382
diff changeset
100 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
101 self.disp = main_app
389
463802281182 Add basic level support (level choosing needs work)
Neil Muller <drnlmuller@gmail.com>
parents: 382
diff changeset
102 self.level = level
24
7584453f4944 Add support for PNG tiles.
Simon Cross <hodgestar@gmail.com>
parents: 17
diff changeset
103 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
104 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
105 self.tv.tga_load_level(level.map)
382
e89e6ad011ac Use code layer to place chickens
Neil Muller <drnlmuller@gmail.com>
parents: 381
diff changeset
106 width, height = self.tv.size
323
978efd39a099 Limit maximum numbe of foxes generated
Neil Muller <drnlmuller@gmail.com>
parents: 320
diff changeset
107 # 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
108 self.max_foxes = level.max_foxes
460
7204c16ab64d Wood market!
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 457
diff changeset
109 self.calculate_wood_groat_exchange_rate()
40
678421bd58ee Money counter with very ugly display hack.
Jeremy Thurgood <firxen@gmail.com>
parents: 39
diff changeset
110
35
8f6c6a54a099 Fixed gameboard display.
Jeremy Thurgood <firxen@gmail.com>
parents: 29
diff changeset
111 self.selected_tool = None
186
f06010d34cd3 Add sprite cursors for building placement.
Simon Cross <hodgestar@gmail.com>
parents: 183
diff changeset
112 self.sprite_cursor = None
487
a5dc09881aa1 rationalised when tools are reset; e.g. you can trade wood without losing selection / move tool. Default toolbar shows correct tool when reloaded (select/move only; other tools reset)
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 485
diff changeset
113 self.selected_chickens = []
489
3c9c664ccb85 selection groups
Neil Muller <drnlmuller@gmail.com>
parents: 488
diff changeset
114 self.stored_selections = {}
116
d539ef5a3333 Add basic chicken->egg cycle
Neil Muller <drnlmuller@gmail.com>
parents: 115
diff changeset
115 self.chickens = set()
d539ef5a3333 Add basic chicken->egg cycle
Neil Muller <drnlmuller@gmail.com>
parents: 115
diff changeset
116 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
117 self.buildings = set()
456
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
118 self._pos_cache = AnimalPositionCache(self)
40
678421bd58ee Money counter with very ugly display hack.
Jeremy Thurgood <firxen@gmail.com>
parents: 39
diff changeset
119 self.cash = 0
422
ab4fc3fe0f96 chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 421
diff changeset
120 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
121 self.eggs = 0
139
1d73de63bd71 Add basic game over screen
Neil Muller <drnlmuller@gmail.com>
parents: 135
diff changeset
122 self.days = 0
79
8241386a1651 Add chicken counter
Neil Muller <drnlmuller@gmail.com>
parents: 77
diff changeset
123 self.killed_foxes = 0
223
527a5d4e3fa3 Disable tools at night.
Simon Cross <hodgestar@gmail.com>
parents: 221
diff changeset
124 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
125 # For the level loading case
fbef17cab632 Use fully rendered map in gameboard choosing screen
Neil Muller <drnlmuller@gmail.com>
parents: 422
diff changeset
126 if self.disp:
447
f04a2490c35f The sub-toolbar rewrite, the finally not crashing version
Neil Muller <drnlmuller@gmail.com>
parents: 444
diff changeset
127 self.toolbar = None
424
fbef17cab632 Use fully rendered map in gameboard choosing screen
Neil Muller <drnlmuller@gmail.com>
parents: 422
diff changeset
128 self.create_display()
fbef17cab632 Use fully rendered map in gameboard choosing screen
Neil Muller <drnlmuller@gmail.com>
parents: 422
diff changeset
129 self.add_cash(level.starting_cash)
428
a356e57529ea buildings cost wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 425
diff changeset
130 self.add_wood(level.starting_wood)
17
cbbc5da7708a Interaction with the game board.
Jeremy Thurgood <firxen@gmail.com>
parents: 14
diff changeset
131
67
9171d9b9ab35 Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents: 66
diff changeset
132 self.fix_buildings()
9171d9b9ab35 Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents: 66
diff changeset
133
408
02a6de5629d6 Levels can include starting equipment
Neil Muller <drnlmuller@gmail.com>
parents: 405
diff changeset
134 cdata = {}
02a6de5629d6 Levels can include starting equipment
Neil Muller <drnlmuller@gmail.com>
parents: 405
diff changeset
135 for tn in equipment.EQUIP_MAP:
02a6de5629d6 Levels can include starting equipment
Neil Muller <drnlmuller@gmail.com>
parents: 405
diff changeset
136 cdata[tn] = (self.add_start_chickens, tn)
382
e89e6ad011ac Use code layer to place chickens
Neil Muller <drnlmuller@gmail.com>
parents: 381
diff changeset
137
e89e6ad011ac Use code layer to place chickens
Neil Muller <drnlmuller@gmail.com>
parents: 381
diff changeset
138 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
139
504
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
140 @classmethod
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
141 def unsimplify(cls, *args, **kwargs):
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
142 """Override default Simplifiable unsimplification."""
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
143 obj = super(GameBoard, cls).unsimplify(*args, **kwargs)
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
144
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
145 obj.tv.png_folder_load_tiles('tiles')
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
146 obj.calculate_wood_groat_exchange_rate()
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
147
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
148 obj._pos_cache = AnimalPositionCache(obj)
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
149 obj._cache_animal_positions()
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
150
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
151 obj.sprite_cursor = None
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
152 obj.set_selected_tool(None, None)
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
153
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
154 obj.disp = None
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
155
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
156 # put chickens, foxes and buildings into sprite list
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
157
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
158 existing_chickens = obj.chickens
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
159 obj.chickens = set()
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
160 for chicken in existing_chickens:
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
161 obj.add_chicken(chicken)
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
162
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
163 existing_foxes = obj.foxes
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
164 obj.foxes = set()
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
165 for fox in existing_foxes:
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
166 obj.add_fox(fox)
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
167
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
168 existing_buildings = obj.buildings
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
169 obj.buildings = set()
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
170 for building in existing_buildings:
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
171 obj.add_building(building)
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
172
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
173 # self.disp is not set properly here
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
174 # whoever unsimplifies the gameboard needs to arrange for it to be
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
175 # set and then call .create_display() and so create:
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
176 # - .toolbar
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
177 # - .tvw
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
178 # - .top_widget
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
179
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
180 return obj
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
181
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
182 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
183 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
184
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
185 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
186 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
187 tbl = gui.Table()
5569430fd82e Display cleanup and rationalisation.
Jeremy Thurgood <firxen@gmail.com>
parents: 35
diff changeset
188 tbl.tr()
447
f04a2490c35f The sub-toolbar rewrite, the finally not crashing version
Neil Muller <drnlmuller@gmail.com>
parents: 444
diff changeset
189 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
190 tbl.td(self.toolbar, valign=-1)
433
8643893635e7 Seperate toolbar and gameboard
Neil Muller <drnlmuller@gmail.com>
parents: 428
diff changeset
191 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
192 tbl.td(self.tvw)
548
27c09c58d89d Remove gameboard and dialog event flow hacks.
Simon Cross <hodgestar@gmail.com>
parents: 544
diff changeset
193
27c09c58d89d Remove gameboard and dialog event flow hacks.
Simon Cross <hodgestar@gmail.com>
parents: 544
diff changeset
194 # we should probably create a custom widget to be the top widget
27c09c58d89d Remove gameboard and dialog event flow hacks.
Simon Cross <hodgestar@gmail.com>
parents: 544
diff changeset
195 # if we want to flow some events to the gameboard
27c09c58d89d Remove gameboard and dialog event flow hacks.
Simon Cross <hodgestar@gmail.com>
parents: 544
diff changeset
196 def event(e):
27c09c58d89d Remove gameboard and dialog event flow hacks.
Simon Cross <hodgestar@gmail.com>
parents: 544
diff changeset
197 if gui.Table.event(tbl, e):
27c09c58d89d Remove gameboard and dialog event flow hacks.
Simon Cross <hodgestar@gmail.com>
parents: 544
diff changeset
198 return True
27c09c58d89d Remove gameboard and dialog event flow hacks.
Simon Cross <hodgestar@gmail.com>
parents: 544
diff changeset
199 return self.event(e)
27c09c58d89d Remove gameboard and dialog event flow hacks.
Simon Cross <hodgestar@gmail.com>
parents: 544
diff changeset
200 tbl.event = event
27c09c58d89d Remove gameboard and dialog event flow hacks.
Simon Cross <hodgestar@gmail.com>
parents: 544
diff changeset
201
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
202 self.top_widget = tbl
504
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
203 self.redraw_counters()
14
d7f295c06a4b Split gameboard screen.
Jeremy Thurgood <firxen@gmail.com>
parents: 12
diff changeset
204
447
f04a2490c35f The sub-toolbar rewrite, the finally not crashing version
Neil Muller <drnlmuller@gmail.com>
parents: 444
diff changeset
205 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
206 """Replace the toolbar"""
f04a2490c35f The sub-toolbar rewrite, the finally not crashing version
Neil Muller <drnlmuller@gmail.com>
parents: 444
diff changeset
207 td = self.toolbar.container
f04a2490c35f The sub-toolbar rewrite, the finally not crashing version
Neil Muller <drnlmuller@gmail.com>
parents: 444
diff changeset
208 td.remove(self.toolbar)
f04a2490c35f The sub-toolbar rewrite, the finally not crashing version
Neil Muller <drnlmuller@gmail.com>
parents: 444
diff changeset
209 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
210 self.toolbar = new_toolbar
449
938498b8cd03 Fix toolbar alignment
Neil Muller <drnlmuller@gmail.com>
parents: 447
diff changeset
211 self.toolbar.rect.size = self.toolbar.resize()
452
17e07b4cdeb4 Seperate counter redrawing as seperate method
Neil Muller <drnlmuller@gmail.com>
parents: 451
diff changeset
212 self.redraw_counters()
17e07b4cdeb4 Seperate counter redrawing as seperate method
Neil Muller <drnlmuller@gmail.com>
parents: 451
diff changeset
213 td.repaint()
17e07b4cdeb4 Seperate counter redrawing as seperate method
Neil Muller <drnlmuller@gmail.com>
parents: 451
diff changeset
214
493
ee883d390ff0 cleaned up tool reset / preservation on toolbar change so that it all happens in one place
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 492
diff changeset
215 if new_toolbar.MOVE_SELECT_PERMITTED:
ee883d390ff0 cleaned up tool reset / preservation on toolbar change so that it all happens in one place
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 492
diff changeset
216 if self.selected_tool not in [constants.TOOL_SELECT_CHICKENS, constants.TOOL_PLACE_ANIMALS]:
ee883d390ff0 cleaned up tool reset / preservation on toolbar change so that it all happens in one place
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 492
diff changeset
217 self.set_selected_tool(None, None)
ee883d390ff0 cleaned up tool reset / preservation on toolbar change so that it all happens in one place
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 492
diff changeset
218 else:
ee883d390ff0 cleaned up tool reset / preservation on toolbar change so that it all happens in one place
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 492
diff changeset
219 self.set_selected_tool(None, None)
ee883d390ff0 cleaned up tool reset / preservation on toolbar change so that it all happens in one place
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 492
diff changeset
220 self.unselect_all()
ee883d390ff0 cleaned up tool reset / preservation on toolbar change so that it all happens in one place
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 492
diff changeset
221
452
17e07b4cdeb4 Seperate counter redrawing as seperate method
Neil Muller <drnlmuller@gmail.com>
parents: 451
diff changeset
222 def redraw_counters(self):
451
d0f586647dfa Redraw counters when changing toolbars
Neil Muller <drnlmuller@gmail.com>
parents: 449
diff changeset
223 self.toolbar.update_egg_counter(self.eggs)
470
fbbd39cfc975 Alter day counter logic a bit to cater for the case when it stops being the last day.
Simon Cross <hodgestar@gmail.com>
parents: 468
diff changeset
224 if self.level.is_last_day(self.days):
fbbd39cfc975 Alter day counter logic a bit to cater for the case when it stops being the last day.
Simon Cross <hodgestar@gmail.com>
parents: 468
diff changeset
225 self.toolbar.day_counter.style.color = (255, 0, 0)
fbbd39cfc975 Alter day counter logic a bit to cater for the case when it stops being the last day.
Simon Cross <hodgestar@gmail.com>
parents: 468
diff changeset
226 else:
fbbd39cfc975 Alter day counter logic a bit to cater for the case when it stops being the last day.
Simon Cross <hodgestar@gmail.com>
parents: 468
diff changeset
227 # can come back from last day when restoring a saved game
fbbd39cfc975 Alter day counter logic a bit to cater for the case when it stops being the last day.
Simon Cross <hodgestar@gmail.com>
parents: 468
diff changeset
228 self.toolbar.day_counter.style.color = (255, 255, 255)
451
d0f586647dfa Redraw counters when changing toolbars
Neil Muller <drnlmuller@gmail.com>
parents: 449
diff changeset
229 self.toolbar.update_day_counter("%s/%s" % (self.days,
d0f586647dfa Redraw counters when changing toolbars
Neil Muller <drnlmuller@gmail.com>
parents: 449
diff changeset
230 self.level.get_max_turns()))
d0f586647dfa Redraw counters when changing toolbars
Neil Muller <drnlmuller@gmail.com>
parents: 449
diff changeset
231 self.toolbar.update_chicken_counter(len(self.chickens))
d0f586647dfa Redraw counters when changing toolbars
Neil Muller <drnlmuller@gmail.com>
parents: 449
diff changeset
232 self.toolbar.update_cash_counter(self.cash)
d0f586647dfa Redraw counters when changing toolbars
Neil Muller <drnlmuller@gmail.com>
parents: 449
diff changeset
233 self.toolbar.update_wood_counter(self.wood)
544
84964077626a Counter display more compact, although not as pretty as it should be.
Jeremy Thurgood <firxen@gmail.com>
parents: 542
diff changeset
234 self.toolbar.update_fox_counter(self.killed_foxes)
447
f04a2490c35f The sub-toolbar rewrite, the finally not crashing version
Neil Muller <drnlmuller@gmail.com>
parents: 444
diff changeset
235
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
236 def update(self):
37
497b53b69280 Always update the vidwidget.
Jeremy Thurgood <firxen@gmail.com>
parents: 36
diff changeset
237 self.tvw.reupdate()
9
3b045083631e Basic game board logic.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
238
3b045083631e Basic game board logic.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
239 def loop(self):
25
6d6ab0c1479d Add placing some chickens and foxes
Neil Muller <drnlmuller@gmail.com>
parents: 24
diff changeset
240 self.tv.loop()
9
3b045083631e Basic game board logic.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
241
162
fa57868123d7 Basic cursor support
Neil Muller <drnlmuller@gmail.com>
parents: 158
diff changeset
242 def set_selected_tool(self, tool, cursor):
223
527a5d4e3fa3 Disable tools at night.
Simon Cross <hodgestar@gmail.com>
parents: 221
diff changeset
243 if not self.day:
472
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
244 return False
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
245 if self.apply_tool_to_selected(tool):
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
246 return False # Using the tool on selected chickens is immediate
35
8f6c6a54a099 Fixed gameboard display.
Jeremy Thurgood <firxen@gmail.com>
parents: 29
diff changeset
247 self.selected_tool = tool
203
653da96db572 Fixed dangling cursor sprite and did some TODO list maintenance.
Jeremy Thurgood <firxen@gmail.com>
parents: 202
diff changeset
248 sprite_curs = None
653da96db572 Fixed dangling cursor sprite and did some TODO list maintenance.
Jeremy Thurgood <firxen@gmail.com>
parents: 202
diff changeset
249 if buildings.is_building(tool):
232
0bd214cf9018 Overlay cost on building sprite cursors.
Simon Cross <hodgestar@gmail.com>
parents: 228
diff changeset
250 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
251 elif equipment.is_equipment(tool):
5b9cd693fe7c Add sprite cursors for equipment buying.
Simon Cross <hodgestar@gmail.com>
parents: 245
diff changeset
252 sprite_curs = sprite_cursor.SpriteCursor(tool.CHICKEN_IMAGE_FILE, self.tv)
474
a50b53983389 Allow moving multiple animals more easily
Neil Muller <drnlmuller@gmail.com>
parents: 473
diff changeset
253 elif tool == constants.TOOL_PLACE_ANIMALS and self.selected_chickens:
a50b53983389 Allow moving multiple animals more easily
Neil Muller <drnlmuller@gmail.com>
parents: 473
diff changeset
254 cursor = cursors.cursors['chicken']
203
653da96db572 Fixed dangling cursor sprite and did some TODO list maintenance.
Jeremy Thurgood <firxen@gmail.com>
parents: 202
diff changeset
255 self.set_cursor(cursor, sprite_curs)
472
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
256 return True
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
257
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
258 def apply_tool_to_selected(self, tool):
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
259 if self.selected_chickens:
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
260 # dispatch call to selected chickens if appropriate
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
261 if tool == constants.TOOL_SELL_CHICKEN:
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
262 self.sell_chicken(None)
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
263 return True
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
264 elif tool == constants.TOOL_SELL_EGG:
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
265 self.sell_egg(None)
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
266 return True
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
267 elif tool == constants.TOOL_SELL_EQUIPMENT:
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
268 self.sell_equipment(None)
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
269 return True
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
270 elif equipment.is_equipment(tool):
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
271 self.buy_equipment(None, tool)
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
272 return True
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
273 return False
203
653da96db572 Fixed dangling cursor sprite and did some TODO list maintenance.
Jeremy Thurgood <firxen@gmail.com>
parents: 202
diff changeset
274
653da96db572 Fixed dangling cursor sprite and did some TODO list maintenance.
Jeremy Thurgood <firxen@gmail.com>
parents: 202
diff changeset
275 def set_cursor(self, cursor=None, sprite_curs=None):
162
fa57868123d7 Basic cursor support
Neil Muller <drnlmuller@gmail.com>
parents: 158
diff changeset
276 if cursor:
fa57868123d7 Basic cursor support
Neil Muller <drnlmuller@gmail.com>
parents: 158
diff changeset
277 pygame.mouse.set_cursor(*cursor)
fa57868123d7 Basic cursor support
Neil Muller <drnlmuller@gmail.com>
parents: 158
diff changeset
278 else:
fa57868123d7 Basic cursor support
Neil Muller <drnlmuller@gmail.com>
parents: 158
diff changeset
279 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
280 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
281 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
282 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
283 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
284 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
285
07b361ebd87f Ensure we clean up highlights, etc.
Neil Muller <drnlmuller@gmail.com>
parents: 212
diff changeset
286 def reset_states(self):
07b361ebd87f Ensure we clean up highlights, etc.
Neil Muller <drnlmuller@gmail.com>
parents: 212
diff changeset
287 """Clear current states (highlights, etc.)"""
245
634491bf37e8 Change toolbar to gui.Toolbar -- gives nicer highlighting.
Simon Cross <hodgestar@gmail.com>
parents: 243
diff changeset
288 self.set_selected_tool(None, None)
634491bf37e8 Change toolbar to gui.Toolbar -- gives nicer highlighting.
Simon Cross <hodgestar@gmail.com>
parents: 243
diff changeset
289 self.toolbar.clear_tool()
17
cbbc5da7708a Interaction with the game board.
Jeremy Thurgood <firxen@gmail.com>
parents: 14
diff changeset
290
186
f06010d34cd3 Add sprite cursors for building placement.
Simon Cross <hodgestar@gmail.com>
parents: 183
diff changeset
291 def update_sprite_cursor(self, e):
f06010d34cd3 Add sprite cursors for building placement.
Simon Cross <hodgestar@gmail.com>
parents: 183
diff changeset
292 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
293 self.sprite_cursor.set_pos(tile_pos)
f06010d34cd3 Add sprite cursors for building placement.
Simon Cross <hodgestar@gmail.com>
parents: 183
diff changeset
294
223
527a5d4e3fa3 Disable tools at night.
Simon Cross <hodgestar@gmail.com>
parents: 221
diff changeset
295 def start_night(self):
527a5d4e3fa3 Disable tools at night.
Simon Cross <hodgestar@gmail.com>
parents: 221
diff changeset
296 self.day, self.night = False, True
527a5d4e3fa3 Disable tools at night.
Simon Cross <hodgestar@gmail.com>
parents: 221
diff changeset
297 self.tv.sun(False)
527a5d4e3fa3 Disable tools at night.
Simon Cross <hodgestar@gmail.com>
parents: 221
diff changeset
298 self.reset_states()
500
4d980444ebfb deselect chickens at night
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 498
diff changeset
299 self.unselect_all()
434
f2a55e5e24db Disable non-selectable toolbar widgets at night
Neil Muller <drnlmuller@gmail.com>
parents: 433
diff changeset
300 self.toolbar.start_night()
413
bdc4757e0497 Add Sniper Rifle and give guns limited ammunition.
Jeremy Thurgood <firxen@gmail.com>
parents: 408
diff changeset
301 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
302 self.eggs = 0
419
d110d55c8449 Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents: 414
diff changeset
303 for chicken in self.chickens.copy():
476
3dae0fc14009 Animals have their own gameboard references instead of lugging them around in params all the time.
Jeremy Thurgood <firxen@gmail.com>
parents: 475
diff changeset
304 chicken.start_night()
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
305 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
306 self._cache_animal_positions()
539
f4d1b9ff9558 Lumberjacks only wander off when their work is done.
Jeremy Thurgood <firxen@gmail.com>
parents: 538
diff changeset
307 self.chickens_chop_wood()
f4d1b9ff9558 Lumberjacks only wander off when their work is done.
Jeremy Thurgood <firxen@gmail.com>
parents: 538
diff changeset
308 self.chickens_scatter()
223
527a5d4e3fa3 Disable tools at night.
Simon Cross <hodgestar@gmail.com>
parents: 221
diff changeset
309
527a5d4e3fa3 Disable tools at night.
Simon Cross <hodgestar@gmail.com>
parents: 221
diff changeset
310 def start_day(self):
512
b112bcf4d435 Add restore game button to main menu.
Simon Cross <hodgestar@gmail.com>
parents: 506
diff changeset
311 if hasattr(self, '_skip_start_day'):
b112bcf4d435 Add restore game button to main menu.
Simon Cross <hodgestar@gmail.com>
parents: 506
diff changeset
312 del self._skip_start_day
b112bcf4d435 Add restore game button to main menu.
Simon Cross <hodgestar@gmail.com>
parents: 506
diff changeset
313 return
223
527a5d4e3fa3 Disable tools at night.
Simon Cross <hodgestar@gmail.com>
parents: 221
diff changeset
314 self.day, self.night = True, False
527a5d4e3fa3 Disable tools at night.
Simon Cross <hodgestar@gmail.com>
parents: 221
diff changeset
315 self.tv.sun(True)
527a5d4e3fa3 Disable tools at night.
Simon Cross <hodgestar@gmail.com>
parents: 221
diff changeset
316 self.reset_states()
434
f2a55e5e24db Disable non-selectable toolbar widgets at night
Neil Muller <drnlmuller@gmail.com>
parents: 433
diff changeset
317 self.toolbar.start_day()
456
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
318 self._pos_cache.clear()
413
bdc4757e0497 Add Sniper Rifle and give guns limited ammunition.
Jeremy Thurgood <firxen@gmail.com>
parents: 408
diff changeset
319 self.advance_day()
bdc4757e0497 Add Sniper Rifle and give guns limited ammunition.
Jeremy Thurgood <firxen@gmail.com>
parents: 408
diff changeset
320 self.clear_foxes()
419
d110d55c8449 Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents: 414
diff changeset
321 for chicken in self.chickens.copy():
476
3dae0fc14009 Animals have their own gameboard references instead of lugging them around in params all the time.
Jeremy Thurgood <firxen@gmail.com>
parents: 475
diff changeset
322 chicken.start_day()
470
fbbd39cfc975 Alter day counter logic a bit to cater for the case when it stops being the last day.
Simon Cross <hodgestar@gmail.com>
parents: 468
diff changeset
323 self.redraw_counters()
223
527a5d4e3fa3 Disable tools at night.
Simon Cross <hodgestar@gmail.com>
parents: 221
diff changeset
324
512
b112bcf4d435 Add restore game button to main menu.
Simon Cross <hodgestar@gmail.com>
parents: 506
diff changeset
325 def skip_next_start_day(self):
b112bcf4d435 Add restore game button to main menu.
Simon Cross <hodgestar@gmail.com>
parents: 506
diff changeset
326 # used to skip the start of the day triggered after
b112bcf4d435 Add restore game button to main menu.
Simon Cross <hodgestar@gmail.com>
parents: 506
diff changeset
327 # reloading a save game
b112bcf4d435 Add restore game button to main menu.
Simon Cross <hodgestar@gmail.com>
parents: 506
diff changeset
328 self._skip_start_day = True
b112bcf4d435 Add restore game button to main menu.
Simon Cross <hodgestar@gmail.com>
parents: 506
diff changeset
329
69
18db99fda6bd Move spawing code from engine to gameboard - seems more natural.
Neil Muller <drnlmuller@gmail.com>
parents: 68
diff changeset
330 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
331 """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
332 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
333 return False
18db99fda6bd Move spawing code from engine to gameboard - seems more natural.
Neil Muller <drnlmuller@gmail.com>
parents: 68
diff changeset
334 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
335 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
336 return False
18db99fda6bd Move spawing code from engine to gameboard - seems more natural.
Neil Muller <drnlmuller@gmail.com>
parents: 68
diff changeset
337 return True
18db99fda6bd Move spawing code from engine to gameboard - seems more natural.
Neil Muller <drnlmuller@gmail.com>
parents: 68
diff changeset
338
17
cbbc5da7708a Interaction with the game board.
Jeremy Thurgood <firxen@gmail.com>
parents: 14
diff changeset
339 def use_tool(self, e):
223
527a5d4e3fa3 Disable tools at night.
Simon Cross <hodgestar@gmail.com>
parents: 221
diff changeset
340 if not self.day:
527a5d4e3fa3 Disable tools at night.
Simon Cross <hodgestar@gmail.com>
parents: 221
diff changeset
341 return
189
37af9e5dd292 Use tool with left button, cancel tool with right button.
Jeremy Thurgood <firxen@gmail.com>
parents: 186
diff changeset
342 if e.button == 3: # Right button
492
e8430f93b23a toggling select/move can now be initiated from no selected tool and in any toolbar where select/move is allowed
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 490
diff changeset
343 if self.toolbar.MOVE_SELECT_PERMITTED:
e8430f93b23a toggling select/move can now be initiated from no selected tool and in any toolbar where select/move is allowed
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 490
diff changeset
344 if self.selected_tool != constants.TOOL_SELECT_CHICKENS:
e8430f93b23a toggling select/move can now be initiated from no selected tool and in any toolbar where select/move is allowed
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 490
diff changeset
345 self.set_selected_tool(constants.TOOL_SELECT_CHICKENS, cursors.cursors["select"])
e8430f93b23a toggling select/move can now be initiated from no selected tool and in any toolbar where select/move is allowed
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 490
diff changeset
346 elif self.selected_tool == constants.TOOL_SELECT_CHICKENS:
e8430f93b23a toggling select/move can now be initiated from no selected tool and in any toolbar where select/move is allowed
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 490
diff changeset
347 self.set_selected_tool(constants.TOOL_PLACE_ANIMALS, cursors.cursors["chicken"])
538
ec5276cfe98b put back code to highlight move/select button appropriately
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 536
diff changeset
348 if self.toolbar.IS_DEFAULT:
ec5276cfe98b put back code to highlight move/select button appropriately
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 536
diff changeset
349 self.toolbar.highlight_move_select_button()
480
312120a99181 right-click now toggles select and move tool
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 479
diff changeset
350 return
488
a9f6c32c8ea9 put back deselect tool + chickens under middleclick, so that you can fall back to old equip behaviour while in equipment menu
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 487
diff changeset
351 elif e.button == 2: # Middle button
490
8308bef91864 fixed so that tool highlight also cleared.
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 489
diff changeset
352 self.reset_states()
488
a9f6c32c8ea9 put back deselect tool + chickens under middleclick, so that you can fall back to old equip behaviour while in equipment menu
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 487
diff changeset
353 self.unselect_all()
189
37af9e5dd292 Use tool with left button, cancel tool with right button.
Jeremy Thurgood <firxen@gmail.com>
parents: 186
diff changeset
354 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
355 return
479
1689b43ed8be Use KMOD_SHIFT to allow shift-click selecting of multiple chickens.
Simon Cross <hodgestar@gmail.com>
parents: 478
diff changeset
356 mods = pygame.key.get_mods()
52
0d4799866bcf Sell chickens and buy fences.
Jeremy Thurgood <firxen@gmail.com>
parents: 40
diff changeset
357 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
358 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
359 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
360 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
361 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
362 self.place_animal(self.tv.screen_to_tile(e.pos))
516
4166a0051bb6 Reset cursor as well when changing tool. Avoid crash with non-default toolbar
Neil Muller <drnlmuller@gmail.com>
parents: 514
diff changeset
363 self.set_selected_tool(constants.TOOL_SELECT_CHICKENS, cursors.cursors["select"])
472
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
364 elif self.selected_tool == constants.TOOL_SELECT_CHICKENS:
514
55b95bb25ced On move, revert to the select tool - why would you want to move the same chicken twice?
David Fraser <davidf@sjsoft.com>
parents: 512
diff changeset
365 # ctrl moves current selection without having to select move tool
55b95bb25ced On move, revert to the select tool - why would you want to move the same chicken twice?
David Fraser <davidf@sjsoft.com>
parents: 512
diff changeset
366 if (mods & KMOD_CTRL):
55b95bb25ced On move, revert to the select tool - why would you want to move the same chicken twice?
David Fraser <davidf@sjsoft.com>
parents: 512
diff changeset
367 self.place_animal(self.tv.screen_to_tile(e.pos))
55b95bb25ced On move, revert to the select tool - why would you want to move the same chicken twice?
David Fraser <davidf@sjsoft.com>
parents: 512
diff changeset
368 else:
55b95bb25ced On move, revert to the select tool - why would you want to move the same chicken twice?
David Fraser <davidf@sjsoft.com>
parents: 512
diff changeset
369 if not (mods & KMOD_SHIFT):
55b95bb25ced On move, revert to the select tool - why would you want to move the same chicken twice?
David Fraser <davidf@sjsoft.com>
parents: 512
diff changeset
370 self.unselect_all()
55b95bb25ced On move, revert to the select tool - why would you want to move the same chicken twice?
David Fraser <davidf@sjsoft.com>
parents: 512
diff changeset
371 self.select_chicken(self.tv.screen_to_tile(e.pos))
65
7e9c8ad06d32 Implement building selling.
Simon Cross <hodgestar@gmail.com>
parents: 64
diff changeset
372 elif self.selected_tool == constants.TOOL_SELL_BUILDING:
7e9c8ad06d32 Implement building selling.
Simon Cross <hodgestar@gmail.com>
parents: 64
diff changeset
373 self.sell_building(self.tv.screen_to_tile(e.pos))
164
ab90040013a7 Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents: 162
diff changeset
374 elif self.selected_tool == constants.TOOL_SELL_EQUIPMENT:
ab90040013a7 Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents: 162
diff changeset
375 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
376 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
377 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
378 elif buildings.is_building(self.selected_tool):
65
7e9c8ad06d32 Implement building selling.
Simon Cross <hodgestar@gmail.com>
parents: 64
diff changeset
379 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
380 elif equipment.is_equipment(self.selected_tool):
472
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
381 if not self.selected_chickens:
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
382 # old selection behaviour
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
383 self.buy_equipment(self.tv.screen_to_tile(e.pos),
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
384 self.selected_tool)
17
cbbc5da7708a Interaction with the game board.
Jeremy Thurgood <firxen@gmail.com>
parents: 14
diff changeset
385
166
4aa800354b7c Rename get_chicken to get_outside_chicken.
Simon Cross <hodgestar@gmail.com>
parents: 165
diff changeset
386 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
387 for chick in self.chickens:
164
ab90040013a7 Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents: 162
diff changeset
388 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
389 return chick
b8f64db0d39e Cleaned up buying and selling a bit.
Jeremy Thurgood <firxen@gmail.com>
parents: 52
diff changeset
390 return None
57
08665fa60345 Implement henhouses and henhouse adding.
Simon Cross <hodgestar@gmail.com>
parents: 54
diff changeset
391
105
7910b4e01dba Add chicken moving tool and start of animal placement.
Simon Cross <hodgestar@gmail.com>
parents: 98
diff changeset
392 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
393 for building in self.buildings:
7910b4e01dba Add chicken moving tool and start of animal placement.
Simon Cross <hodgestar@gmail.com>
parents: 98
diff changeset
394 if building.covers(tile_pos):
7910b4e01dba Add chicken moving tool and start of animal placement.
Simon Cross <hodgestar@gmail.com>
parents: 98
diff changeset
395 return building
7910b4e01dba Add chicken moving tool and start of animal placement.
Simon Cross <hodgestar@gmail.com>
parents: 98
diff changeset
396 return None
7910b4e01dba Add chicken moving tool and start of animal placement.
Simon Cross <hodgestar@gmail.com>
parents: 98
diff changeset
397
7910b4e01dba Add chicken moving tool and start of animal placement.
Simon Cross <hodgestar@gmail.com>
parents: 98
diff changeset
398 def sell_chicken(self, tile_pos):
192
a490ee2ef446 Allow selling of chickens in henhouses
Neil Muller <drnlmuller@gmail.com>
parents: 191
diff changeset
399
310
49c58dda8ac2 Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents: 307
diff changeset
400 def do_sell(chicken, update_button=None):
192
a490ee2ef446 Allow selling of chickens in henhouses
Neil Muller <drnlmuller@gmail.com>
parents: 191
diff changeset
401 if not chicken:
a490ee2ef446 Allow selling of chickens in henhouses
Neil Muller <drnlmuller@gmail.com>
parents: 191
diff changeset
402 return False # sanity check
a490ee2ef446 Allow selling of chickens in henhouses
Neil Muller <drnlmuller@gmail.com>
parents: 191
diff changeset
403 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
404 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
405 TextDialog("Squuaaawwwwwk!", msg).open()
192
a490ee2ef446 Allow selling of chickens in henhouses
Neil Muller <drnlmuller@gmail.com>
parents: 191
diff changeset
406 return False
228
f74de4280e20 Sell chicken's equipment when you sell the chicken.
Simon Cross <hodgestar@gmail.com>
parents: 227
diff changeset
407 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
408 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
409 chicken.unequip(item)
389
463802281182 Add basic level support (level choosing needs work)
Neil Muller <drnlmuller@gmail.com>
parents: 382
diff changeset
410 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
411 sound.play_sound("sell-chicken.ogg")
310
49c58dda8ac2 Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents: 307
diff changeset
412 if update_button:
49c58dda8ac2 Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents: 307
diff changeset
413 update_button(chicken, empty=True)
49c58dda8ac2 Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents: 307
diff changeset
414 self.remove_chicken(chicken)
192
a490ee2ef446 Allow selling of chickens in henhouses
Neil Muller <drnlmuller@gmail.com>
parents: 191
diff changeset
415 return True
a490ee2ef446 Allow selling of chickens in henhouses
Neil Muller <drnlmuller@gmail.com>
parents: 191
diff changeset
416
472
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
417 if tile_pos:
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
418 chick = self.get_outside_chicken(tile_pos)
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
419 if chick is None:
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
420 building = self.get_building(tile_pos)
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
421 if building and building.HENHOUSE:
474
a50b53983389 Allow moving multiple animals more easily
Neil Muller <drnlmuller@gmail.com>
parents: 473
diff changeset
422 self.open_building_dialog(building, False, do_sell)
472
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
423 return
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
424 do_sell(chick)
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
425 else:
556
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
426 def sure(val):
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
427 if val:
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
428 for chick in self.selected_chickens[:]:
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
429 do_sell(chick)
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
430 if self._check_dangerous_sale():
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
431 dialog = misc.CheckDialog(sure,
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
432 "These chickens have equipment or eggs. Do you want to sell?",
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
433 "Yes, Sell Them", "No, Don't Sell", None)
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
434 self.disp.open(dialog)
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
435 else:
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
436 sure(1)
192
a490ee2ef446 Allow selling of chickens in henhouses
Neil Muller <drnlmuller@gmail.com>
parents: 191
diff changeset
437
243
4f86c2616cdf Variable number of eggs for chickens
Neil Muller <drnlmuller@gmail.com>
parents: 241
diff changeset
438 def sell_one_egg(self, chicken):
4f86c2616cdf Variable number of eggs for chickens
Neil Muller <drnlmuller@gmail.com>
parents: 241
diff changeset
439 if chicken.eggs:
389
463802281182 Add basic level support (level choosing needs work)
Neil Muller <drnlmuller@gmail.com>
parents: 382
diff changeset
440 self.add_cash(self.level.sell_price_egg)
476
3dae0fc14009 Animals have their own gameboard references instead of lugging them around in params all the time.
Jeremy Thurgood <firxen@gmail.com>
parents: 475
diff changeset
441 chicken.remove_one_egg()
243
4f86c2616cdf Variable number of eggs for chickens
Neil Muller <drnlmuller@gmail.com>
parents: 241
diff changeset
442 return True
4f86c2616cdf Variable number of eggs for chickens
Neil Muller <drnlmuller@gmail.com>
parents: 241
diff changeset
443 return False
4f86c2616cdf Variable number of eggs for chickens
Neil Muller <drnlmuller@gmail.com>
parents: 241
diff changeset
444
475
d4f04d81fe54 Rinkhals eats eggs, along with associated changes.
Jeremy Thurgood <firxen@gmail.com>
parents: 474
diff changeset
445 def remove_eggs(self, num):
d4f04d81fe54 Rinkhals eats eggs, along with associated changes.
Jeremy Thurgood <firxen@gmail.com>
parents: 474
diff changeset
446 self.eggs -= num
d4f04d81fe54 Rinkhals eats eggs, along with associated changes.
Jeremy Thurgood <firxen@gmail.com>
parents: 474
diff changeset
447 self.toolbar.update_egg_counter(self.eggs)
d4f04d81fe54 Rinkhals eats eggs, along with associated changes.
Jeremy Thurgood <firxen@gmail.com>
parents: 474
diff changeset
448
192
a490ee2ef446 Allow selling of chickens in henhouses
Neil Muller <drnlmuller@gmail.com>
parents: 191
diff changeset
449 def sell_egg(self, tile_pos):
310
49c58dda8ac2 Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents: 307
diff changeset
450 def do_sell(chicken, update_button=None):
243
4f86c2616cdf Variable number of eggs for chickens
Neil Muller <drnlmuller@gmail.com>
parents: 241
diff changeset
451 # We try sell and egg
4f86c2616cdf Variable number of eggs for chickens
Neil Muller <drnlmuller@gmail.com>
parents: 241
diff changeset
452 if self.sell_one_egg(chicken):
193
db246683d5da Selling eggs now works
Neil Muller <drnlmuller@gmail.com>
parents: 192
diff changeset
453 sound.play_sound("sell-chicken.ogg")
243
4f86c2616cdf Variable number of eggs for chickens
Neil Muller <drnlmuller@gmail.com>
parents: 241
diff changeset
454 # Force toolbar update
193
db246683d5da Selling eggs now works
Neil Muller <drnlmuller@gmail.com>
parents: 192
diff changeset
455 self.toolbar.chsize()
310
49c58dda8ac2 Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents: 307
diff changeset
456 if update_button:
49c58dda8ac2 Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents: 307
diff changeset
457 update_button(chicken)
192
a490ee2ef446 Allow selling of chickens in henhouses
Neil Muller <drnlmuller@gmail.com>
parents: 191
diff changeset
458 return False
193
db246683d5da Selling eggs now works
Neil Muller <drnlmuller@gmail.com>
parents: 192
diff changeset
459
473
4b8ca482ea08 don't crash when selling eggs from selected chickens
Neil Muller <drnlmuller@gmail.com>
parents: 472
diff changeset
460 if tile_pos:
4b8ca482ea08 don't crash when selling eggs from selected chickens
Neil Muller <drnlmuller@gmail.com>
parents: 472
diff changeset
461 building = self.get_building(tile_pos)
4b8ca482ea08 don't crash when selling eggs from selected chickens
Neil Muller <drnlmuller@gmail.com>
parents: 472
diff changeset
462 if building and building.HENHOUSE:
523
103b0fc36722 Apply action to all selected chickens in building dialog
Neil Muller <drnlmuller@gmail.com>
parents: 522
diff changeset
463 self.open_building_dialog(building, False, do_sell)
473
4b8ca482ea08 don't crash when selling eggs from selected chickens
Neil Muller <drnlmuller@gmail.com>
parents: 472
diff changeset
464 else:
4b8ca482ea08 don't crash when selling eggs from selected chickens
Neil Muller <drnlmuller@gmail.com>
parents: 472
diff changeset
465 for chicken in self.selected_chickens:
4b8ca482ea08 don't crash when selling eggs from selected chickens
Neil Muller <drnlmuller@gmail.com>
parents: 472
diff changeset
466 do_sell(chicken)
54
b8f64db0d39e Cleaned up buying and selling a bit.
Jeremy Thurgood <firxen@gmail.com>
parents: 52
diff changeset
467
556
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
468 def _check_dangerous_sale(self):
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
469 # Dangerous sales are: selling chickens with equipment & selling
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
470 # chickens with eggs
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
471 for chick in self.selected_chickens:
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
472 if chick.eggs or chick.weapons() or chick.armour():
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
473 return True
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
474 return False
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
475
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
476 def _check_dangerous_move(self, building=None):
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
477 # Dangerous move involves moving chickens WITH eggs out of their
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
478 # current building
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
479 for chick in self.selected_chickens:
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
480 if chick.eggs and chick.abode and \
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
481 chick.abode.building is not building:
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
482 return True
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
483 return False # safe move
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
484
489
3c9c664ccb85 selection groups
Neil Muller <drnlmuller@gmail.com>
parents: 488
diff changeset
485 def select_animal(self, animal):
3c9c664ccb85 selection groups
Neil Muller <drnlmuller@gmail.com>
parents: 488
diff changeset
486 self.selected_chickens.append(animal)
561
7f037ee2a6c8 Show count of selected chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 557
diff changeset
487 if animal.abode:
7f037ee2a6c8 Show count of selected chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 557
diff changeset
488 animal.abode.building.update_occupant_count()
489
3c9c664ccb85 selection groups
Neil Muller <drnlmuller@gmail.com>
parents: 488
diff changeset
489 animal.equip(equipment.Spotlight())
472
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
490
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
491 def unselect_all(self):
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
492 # Clear any highlights
561
7f037ee2a6c8 Show count of selected chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 557
diff changeset
493 old_sel = self.selected_chickens
7f037ee2a6c8 Show count of selected chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 557
diff changeset
494 self.selected_chickens = []
7f037ee2a6c8 Show count of selected chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 557
diff changeset
495 for chick in old_sel:
472
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
496 chick.unequip_by_name("Spotlight")
561
7f037ee2a6c8 Show count of selected chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 557
diff changeset
497 if chick.abode:
7f037ee2a6c8 Show count of selected chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 557
diff changeset
498 chick.abode.building.update_occupant_count()
472
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
499
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
500 def unselect_animal(self, animal):
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
501 if animal in self.selected_chickens:
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
502 self.selected_chickens.remove(animal)
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
503 animal.unequip_by_name("Spotlight")
561
7f037ee2a6c8 Show count of selected chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 557
diff changeset
504 if animal.abode:
7f037ee2a6c8 Show count of selected chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 557
diff changeset
505 animal.abode.building.update_occupant_count()
472
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
506
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
507 def get_chicken_at_pos(self, tile_pos):
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
508 chicken = self.get_outside_chicken(tile_pos)
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
509 if chicken:
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
510 return chicken
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
511 building = self.get_building(tile_pos)
481
fac63919a972 Don't look for chickens in fences
Neil Muller <drnlmuller@gmail.com>
parents: 480
diff changeset
512 if building and building.ABODE:
498
62b9a4e21f1a chickens in closed buildings deselected. building opens if you put in chickens and it's not full. opening building with move or select tool allows rearrangement of chickens in building. fixed multiselect in buildings.
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 497
diff changeset
513 self.open_building_dialog(building, True)
472
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
514
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
515 def select_chicken(self, tile_pos):
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
516 """Handle a select chicken event"""
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
517 # Get the chicken at this position
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
518 chicken = self.get_chicken_at_pos(tile_pos)
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
519 if not chicken:
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
520 return # do nothing
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
521 elif chicken in self.selected_chickens:
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
522 self.unselect_animal(chicken)
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
523 else:
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
524 self.select_animal(chicken)
200
67d10f7e0159 selected chickens are selected
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 197
diff changeset
525
556
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
526 def _do_move_selected(self, building, tile_pos):
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
527 """Internal helper function for place_animal"""
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
528 if building and building.ABODE:
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
529 for chicken in self.selected_chickens[:]:
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
530 try:
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
531 place = building.first_empty_place()
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
532 self.relocate_animal(chicken, place=place)
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
533 chicken.equip(equipment.Nest())
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
534 self.unselect_animal(chicken)
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
535 except buildings.BuildingFullError:
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
536 pass
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
537 try:
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
538 # if there's a space left, open the building
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
539 building.first_empty_place()
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
540 self.open_building_dialog(building, True)
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
541 except buildings.BuildingFullError:
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
542 pass
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
543 if not self.selected_chickens:
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
544 # if we placed all the chickens, switch to select cursor
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
545 pygame.mouse.set_cursor(*cursors.cursors['select'])
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
546 elif self.tv.get(tile_pos) == self.GRASSLAND:
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
547 for chicken in self.selected_chickens:
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
548 try_pos = tile_pos
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
549 cur_chick = self.get_outside_chicken(try_pos)
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
550 if cur_chick == chicken:
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
551 continue
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
552 if cur_chick:
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
553 try_pos = None
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
554 # find a free square nearby
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
555 poss = [(tile_pos[0] + x, tile_pos[1] + y)
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
556 for x in range(-1, 2) for y in range(-1, 2)
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
557 if (x, y) != (0, 0)]
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
558 poss.extend([(tile_pos[0] + x, tile_pos[1] + y)
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
559 for x in range(-2, 3, 2) for y in range(-2, 3)
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
560 if (x, y) != (0, 0)])
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
561 for cand in poss:
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
562 if self.tv.get(cand) == self.GRASSLAND and \
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
563 not self.get_outside_chicken(cand):
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
564 try_pos = cand
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
565 break
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
566 if try_pos:
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
567 chicken.unequip_by_name("Nest")
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
568 self.relocate_animal(chicken, tile_pos=try_pos)
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
569 chicken.remove_eggs()
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
570
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
571
105
7910b4e01dba Add chicken moving tool and start of animal placement.
Simon Cross <hodgestar@gmail.com>
parents: 98
diff changeset
572 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
573 """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
574
7910b4e01dba Add chicken moving tool and start of animal placement.
Simon Cross <hodgestar@gmail.com>
parents: 98
diff changeset
575 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
576 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
577 """
472
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
578 if tile_pos and not self.selected_chickens:
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
579 # Old behaviour
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
580 chicken = self.get_chicken_at_pos(tile_pos)
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
581 if chicken:
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
582 self.select_animal(chicken)
162
fa57868123d7 Basic cursor support
Neil Muller <drnlmuller@gmail.com>
parents: 158
diff changeset
583 pygame.mouse.set_cursor(*cursors.cursors['chicken'])
472
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
584 return
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
585 elif tile_pos:
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
586 building = self.get_building(tile_pos)
556
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
587 def sure(val):
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
588 if val:
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
589 self._do_move_selected(building, tile_pos)
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
590
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
591 if self._check_dangerous_move(building):
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
592 dialog = misc.CheckDialog(sure,
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
593 "These chickens have eggs. Do you want to move them?",
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
594 "Yes, Move Them", "No, Don't Move", None)
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
595 self.disp.open(dialog)
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
596 else:
46f6f1a98f3f Add warning dialogs for dangerous operations
Neil Muller <drnlmuller@gmail.com>
parents: 553
diff changeset
597 sure(1)
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
598
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
599 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
600 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
601 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
602 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
603 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
604 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
605 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
606 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
607 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
608 self.set_visibility(chicken)
125
2e3a05b9594d Chickens in buildings\!
Simon Cross <hodgestar@gmail.com>
parents: 124
diff changeset
609
397
532f1ea476ff Make foxes enter buildings, with a seperate count for them
Neil Muller <drnlmuller@gmail.com>
parents: 396
diff changeset
610 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
611 if animal.outside():
532f1ea476ff Make foxes enter buildings, with a seperate count for them
Neil Muller <drnlmuller@gmail.com>
parents: 396
diff changeset
612 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
613 self.tv.sprites.append(animal)
125
2e3a05b9594d Chickens in buildings\!
Simon Cross <hodgestar@gmail.com>
parents: 124
diff changeset
614 else:
397
532f1ea476ff Make foxes enter buildings, with a seperate count for them
Neil Muller <drnlmuller@gmail.com>
parents: 396
diff changeset
615 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
616 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
617
302
01c1682dc250 Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 298
diff changeset
618 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
619 """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
620 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
621
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
622 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
623 self.disp.close(tbl)
170
92d11e0544bc Switch building to selected image when building is selected.
Simon Cross <hodgestar@gmail.com>
parents: 169
diff changeset
624 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
625 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
626
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
627 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
628 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
629
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
630 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
631 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
632 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
633 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
634 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
635 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
636
302
01c1682dc250 Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 298
diff changeset
637 if x:
01c1682dc250 Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 298
diff changeset
638 offset = (self.disp.rect.center[0] + x,
01c1682dc250 Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 298
diff changeset
639 self.disp.rect.center[1] + y)
01c1682dc250 Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 298
diff changeset
640 else:
01c1682dc250 Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 298
diff changeset
641 offset = None
01c1682dc250 Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 298
diff changeset
642 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
643 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
644
474
a50b53983389 Allow moving multiple animals more easily
Neil Muller <drnlmuller@gmail.com>
parents: 473
diff changeset
645 def open_building_dialog(self, building, fill_empty, 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
646 """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
647
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents: 203
diff changeset
648 place_button_map = {}
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents: 203
diff changeset
649
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents: 203
diff changeset
650 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
651 """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
652 if animal:
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents: 203
diff changeset
653 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
654 if button:
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents: 203
diff changeset
655 if empty:
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents: 203
diff changeset
656 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
657 else:
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents: 203
diff changeset
658 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
659
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents: 203
diff changeset
660 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
661 """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
662 if place.occupant:
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents: 203
diff changeset
663 # 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
664 if not sell_callback:
498
62b9a4e21f1a chickens in closed buildings deselected. building opens if you put in chickens and it's not full. opening building with move or select tool allows rearrangement of chickens in building. fixed multiselect in buildings.
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 497
diff changeset
665 mods = pygame.key.get_mods()
62b9a4e21f1a chickens in closed buildings deselected. building opens if you put in chickens and it's not full. opening building with move or select tool allows rearrangement of chickens in building. fixed multiselect in buildings.
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 497
diff changeset
666 if not (mods & KMOD_SHIFT):
62b9a4e21f1a chickens in closed buildings deselected. building opens if you put in chickens and it's not full. opening building with move or select tool allows rearrangement of chickens in building. fixed multiselect in buildings.
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 497
diff changeset
667 chkns = self.selected_chickens
62b9a4e21f1a chickens in closed buildings deselected. building opens if you put in chickens and it's not full. opening building with move or select tool allows rearrangement of chickens in building. fixed multiselect in buildings.
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 497
diff changeset
668 self.unselect_all()
62b9a4e21f1a chickens in closed buildings deselected. building opens if you put in chickens and it's not full. opening building with move or select tool allows rearrangement of chickens in building. fixed multiselect in buildings.
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 497
diff changeset
669 for chkn in chkns:
62b9a4e21f1a chickens in closed buildings deselected. building opens if you put in chickens and it's not full. opening building with move or select tool allows rearrangement of chickens in building. fixed multiselect in buildings.
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 497
diff changeset
670 update_button(chkn)
62b9a4e21f1a chickens in closed buildings deselected. building opens if you put in chickens and it's not full. opening building with move or select tool allows rearrangement of chickens in building. fixed multiselect in buildings.
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 497
diff changeset
671 if place.occupant in self.selected_chickens:
62b9a4e21f1a chickens in closed buildings deselected. building opens if you put in chickens and it's not full. opening building with move or select tool allows rearrangement of chickens in building. fixed multiselect in buildings.
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 497
diff changeset
672 self.unselect_animal(place.occupant)
62b9a4e21f1a chickens in closed buildings deselected. building opens if you put in chickens and it's not full. opening building with move or select tool allows rearrangement of chickens in building. fixed multiselect in buildings.
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 497
diff changeset
673 else:
62b9a4e21f1a chickens in closed buildings deselected. building opens if you put in chickens and it's not full. opening building with move or select tool allows rearrangement of chickens in building. fixed multiselect in buildings.
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 497
diff changeset
674 self.select_animal(place.occupant)
208
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents: 203
diff changeset
675 # select new animal (on button)
472
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
676 update_button(place.occupant)
208
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents: 203
diff changeset
677 else:
523
103b0fc36722 Apply action to all selected chickens in building dialog
Neil Muller <drnlmuller@gmail.com>
parents: 522
diff changeset
678 # FIXME: This should really match the behaviour for
103b0fc36722 Apply action to all selected chickens in building dialog
Neil Muller <drnlmuller@gmail.com>
parents: 522
diff changeset
679 # outside buildings, but that requires using the toolbar
103b0fc36722 Apply action to all selected chickens in building dialog
Neil Muller <drnlmuller@gmail.com>
parents: 522
diff changeset
680 # while the dialog is open.
103b0fc36722 Apply action to all selected chickens in building dialog
Neil Muller <drnlmuller@gmail.com>
parents: 522
diff changeset
681 to_process = [place.occupant]
103b0fc36722 Apply action to all selected chickens in building dialog
Neil Muller <drnlmuller@gmail.com>
parents: 522
diff changeset
682 if place.occupant in self.selected_chickens:
103b0fc36722 Apply action to all selected chickens in building dialog
Neil Muller <drnlmuller@gmail.com>
parents: 522
diff changeset
683 # We do the same action for all the selected chickens
103b0fc36722 Apply action to all selected chickens in building dialog
Neil Muller <drnlmuller@gmail.com>
parents: 522
diff changeset
684 to_process = self.selected_chickens
103b0fc36722 Apply action to all selected chickens in building dialog
Neil Muller <drnlmuller@gmail.com>
parents: 522
diff changeset
685 for chick in to_process[:]:
103b0fc36722 Apply action to all selected chickens in building dialog
Neil Muller <drnlmuller@gmail.com>
parents: 522
diff changeset
686 sell_callback(chick, update_button)
192
a490ee2ef446 Allow selling of chickens in henhouses
Neil Muller <drnlmuller@gmail.com>
parents: 191
diff changeset
687 else:
208
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents: 203
diff changeset
688 # there is no occupant, attempt to fill the space
474
a50b53983389 Allow moving multiple animals more easily
Neil Muller <drnlmuller@gmail.com>
parents: 473
diff changeset
689 if self.selected_chickens and fill_empty:
208
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents: 203
diff changeset
690 # empty old nest (on button)
472
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
691 update_button(self.selected_chickens[0], empty=True)
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
692 self.relocate_animal(self.selected_chickens[0], place=place)
208
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents: 203
diff changeset
693 # populate the new nest (on button)
472
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
694 update_button(self.selected_chickens[0])
125
2e3a05b9594d Chickens in buildings\!
Simon Cross <hodgestar@gmail.com>
parents: 124
diff changeset
695
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
696 tbl = gui.Table()
125
2e3a05b9594d Chickens in buildings\!
Simon Cross <hodgestar@gmail.com>
parents: 124
diff changeset
697 columns = building.max_floor_width()
2e3a05b9594d Chickens in buildings\!
Simon Cross <hodgestar@gmail.com>
parents: 124
diff changeset
698 kwargs = { 'style': { 'padding_left': 10, 'padding_bottom': 10 }}
2e3a05b9594d Chickens in buildings\!
Simon Cross <hodgestar@gmail.com>
parents: 124
diff changeset
699 for floor in building.floors():
2e3a05b9594d Chickens in buildings\!
Simon Cross <hodgestar@gmail.com>
parents: 124
diff changeset
700 tbl.tr()
2e3a05b9594d Chickens in buildings\!
Simon Cross <hodgestar@gmail.com>
parents: 124
diff changeset
701 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
702 tbl.tr()
125
2e3a05b9594d Chickens in buildings\!
Simon Cross <hodgestar@gmail.com>
parents: 124
diff changeset
703 for row in floor.rows():
2e3a05b9594d Chickens in buildings\!
Simon Cross <hodgestar@gmail.com>
parents: 124
diff changeset
704 tbl.tr()
2e3a05b9594d Chickens in buildings\!
Simon Cross <hodgestar@gmail.com>
parents: 124
diff changeset
705 for place in row:
2e3a05b9594d Chickens in buildings\!
Simon Cross <hodgestar@gmail.com>
parents: 124
diff changeset
706 if place.occupant is None:
2e3a05b9594d Chickens in buildings\!
Simon Cross <hodgestar@gmail.com>
parents: 124
diff changeset
707 button = gui.Button(icons.EMPTY_NEST_ICON)
2e3a05b9594d Chickens in buildings\!
Simon Cross <hodgestar@gmail.com>
parents: 124
diff changeset
708 else:
201
fe1e9c18d4d7 layering bugfix; indoor chickens now use normal chicken icons
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 200
diff changeset
709 button = gui.Button(icons.animal_icon(place.occupant))
125
2e3a05b9594d Chickens in buildings\!
Simon Cross <hodgestar@gmail.com>
parents: 124
diff changeset
710 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
711 button.connect(gui.CLICK, nest_clicked, place, button)
125
2e3a05b9594d Chickens in buildings\!
Simon Cross <hodgestar@gmail.com>
parents: 124
diff changeset
712 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
713
170
92d11e0544bc Switch building to selected image when building is selected.
Simon Cross <hodgestar@gmail.com>
parents: 169
diff changeset
714 building.selected(True)
92d11e0544bc Switch building to selected image when building is selected.
Simon Cross <hodgestar@gmail.com>
parents: 169
diff changeset
715 def close_callback():
498
62b9a4e21f1a chickens in closed buildings deselected. building opens if you put in chickens and it's not full. opening building with move or select tool allows rearrangement of chickens in building. fixed multiselect in buildings.
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 497
diff changeset
716 for floor in building.floors():
62b9a4e21f1a chickens in closed buildings deselected. building opens if you put in chickens and it's not full. opening building with move or select tool allows rearrangement of chickens in building. fixed multiselect in buildings.
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 497
diff changeset
717 for row in floor.rows():
62b9a4e21f1a chickens in closed buildings deselected. building opens if you put in chickens and it's not full. opening building with move or select tool allows rearrangement of chickens in building. fixed multiselect in buildings.
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 497
diff changeset
718 for place in row:
62b9a4e21f1a chickens in closed buildings deselected. building opens if you put in chickens and it's not full. opening building with move or select tool allows rearrangement of chickens in building. fixed multiselect in buildings.
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 497
diff changeset
719 if place.occupant is not None:
62b9a4e21f1a chickens in closed buildings deselected. building opens if you put in chickens and it's not full. opening building with move or select tool allows rearrangement of chickens in building. fixed multiselect in buildings.
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 497
diff changeset
720 self.unselect_animal(place.occupant)
170
92d11e0544bc Switch building to selected image when building is selected.
Simon Cross <hodgestar@gmail.com>
parents: 169
diff changeset
721 building.selected(False)
92d11e0544bc Switch building to selected image when building is selected.
Simon Cross <hodgestar@gmail.com>
parents: 169
diff changeset
722
522
6f41a565e910 Add 'select all' button
Neil Muller <drnlmuller@gmail.com>
parents: 521
diff changeset
723 def select_all_callback():
6f41a565e910 Add 'select all' button
Neil Muller <drnlmuller@gmail.com>
parents: 521
diff changeset
724 self.unselect_all()
6f41a565e910 Add 'select all' button
Neil Muller <drnlmuller@gmail.com>
parents: 521
diff changeset
725 for chicken in building.occupants():
6f41a565e910 Add 'select all' button
Neil Muller <drnlmuller@gmail.com>
parents: 521
diff changeset
726 self.select_animal(chicken)
6f41a565e910 Add 'select all' button
Neil Muller <drnlmuller@gmail.com>
parents: 521
diff changeset
727 update_button(chicken)
6f41a565e910 Add 'select all' button
Neil Muller <drnlmuller@gmail.com>
parents: 521
diff changeset
728
262
d508248041ff avoid passing events in twice
Neil Muller <drnlmuller@gmail.com>
parents: 258
diff changeset
729 def evict_callback():
472
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
730 if not self.selected_chickens:
264
812bd4cda8b8 evict button
Neil Muller <drnlmuller@gmail.com>
parents: 262
diff changeset
731 return
495
d2ca4af92c79 fixed multiple chicken eviction bug
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 493
diff changeset
732 for tile_pos in building.adjacent_tiles():
d2ca4af92c79 fixed multiple chicken eviction bug
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 493
diff changeset
733 if self.tv.get(tile_pos) != self.GRASSLAND:
d2ca4af92c79 fixed multiple chicken eviction bug
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 493
diff changeset
734 continue
d2ca4af92c79 fixed multiple chicken eviction bug
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 493
diff changeset
735 if self.get_outside_chicken(tile_pos) is None:
d2ca4af92c79 fixed multiple chicken eviction bug
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 493
diff changeset
736 for chicken in self.selected_chickens:
472
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
737 update_button(chicken, empty=True)
495
d2ca4af92c79 fixed multiple chicken eviction bug
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 493
diff changeset
738 # this will place all the chickens
d2ca4af92c79 fixed multiple chicken eviction bug
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 493
diff changeset
739 self.place_animal(tile_pos)
d2ca4af92c79 fixed multiple chicken eviction bug
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 493
diff changeset
740 break
262
d508248041ff avoid passing events in twice
Neil Muller <drnlmuller@gmail.com>
parents: 258
diff changeset
741
525
d9886377b6a2 Hack middle-click clearing selection into the building_dialog
Neil Muller <drnlmuller@gmail.com>
parents: 524
diff changeset
742 def dlg_event(e):
d9886377b6a2 Hack middle-click clearing selection into the building_dialog
Neil Muller <drnlmuller@gmail.com>
parents: 524
diff changeset
743 if e.type == MOUSEBUTTONDOWN and e.button == 2: # Middle
d9886377b6a2 Hack middle-click clearing selection into the building_dialog
Neil Muller <drnlmuller@gmail.com>
parents: 524
diff changeset
744 self.unselect_all()
d9886377b6a2 Hack middle-click clearing selection into the building_dialog
Neil Muller <drnlmuller@gmail.com>
parents: 524
diff changeset
745 for chicken in building.occupants():
d9886377b6a2 Hack middle-click clearing selection into the building_dialog
Neil Muller <drnlmuller@gmail.com>
parents: 524
diff changeset
746 update_button(chicken)
d9886377b6a2 Hack middle-click clearing selection into the building_dialog
Neil Muller <drnlmuller@gmail.com>
parents: 524
diff changeset
747 return False
d9886377b6a2 Hack middle-click clearing selection into the building_dialog
Neil Muller <drnlmuller@gmail.com>
parents: 524
diff changeset
748 return gui.Table.event(tbl, e)
d9886377b6a2 Hack middle-click clearing selection into the building_dialog
Neil Muller <drnlmuller@gmail.com>
parents: 524
diff changeset
749
d9886377b6a2 Hack middle-click clearing selection into the building_dialog
Neil Muller <drnlmuller@gmail.com>
parents: 524
diff changeset
750
522
6f41a565e910 Add 'select all' button
Neil Muller <drnlmuller@gmail.com>
parents: 521
diff changeset
751 tbl.tr()
6f41a565e910 Add 'select all' button
Neil Muller <drnlmuller@gmail.com>
parents: 521
diff changeset
752 select_button = gui.Button('Select All')
6f41a565e910 Add 'select all' button
Neil Muller <drnlmuller@gmail.com>
parents: 521
diff changeset
753 select_button.connect(gui.CLICK, select_all_callback)
6f41a565e910 Add 'select all' button
Neil Muller <drnlmuller@gmail.com>
parents: 521
diff changeset
754 tbl.td(select_button, colspan=2, **kwargs)
262
d508248041ff avoid passing events in twice
Neil Muller <drnlmuller@gmail.com>
parents: 258
diff changeset
755 if not sell_callback:
522
6f41a565e910 Add 'select all' button
Neil Muller <drnlmuller@gmail.com>
parents: 521
diff changeset
756 evict_button = gui.Button('Evict')
6f41a565e910 Add 'select all' button
Neil Muller <drnlmuller@gmail.com>
parents: 521
diff changeset
757 evict_button.connect(gui.CLICK, evict_callback)
6f41a565e910 Add 'select all' button
Neil Muller <drnlmuller@gmail.com>
parents: 521
diff changeset
758 tbl.td(evict_button, colspan=2, **kwargs)
262
d508248041ff avoid passing events in twice
Neil Muller <drnlmuller@gmail.com>
parents: 258
diff changeset
759
525
d9886377b6a2 Hack middle-click clearing selection into the building_dialog
Neil Muller <drnlmuller@gmail.com>
parents: 524
diff changeset
760 tbl.event = dlg_event
d9886377b6a2 Hack middle-click clearing selection into the building_dialog
Neil Muller <drnlmuller@gmail.com>
parents: 524
diff changeset
761
170
92d11e0544bc Switch building to selected image when building is selected.
Simon Cross <hodgestar@gmail.com>
parents: 169
diff changeset
762 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
763
65
7e9c8ad06d32 Implement building selling.
Simon Cross <hodgestar@gmail.com>
parents: 64
diff changeset
764 def buy_building(self, tile_pos, building_cls):
557
50d6c68ce267 Add gameboard to buildings. Update save version as this breaks old save games
Neil Muller <drnlmuller@gmail.com>
parents: 556
diff changeset
765 building = building_cls(tile_pos, self)
428
a356e57529ea buildings cost wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 425
diff changeset
766 if self.wood < building.buy_price():
57
08665fa60345 Implement henhouses and henhouse adding.
Simon Cross <hodgestar@gmail.com>
parents: 54
diff changeset
767 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
768 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
769 return
557
50d6c68ce267 Add gameboard to buildings. Update save version as this breaks old save games
Neil Muller <drnlmuller@gmail.com>
parents: 556
diff changeset
770 if building.place():
428
a356e57529ea buildings cost wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 425
diff changeset
771 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
772 self.add_building(building)
60
e2631c8e2cd6 Implement guard towers (with temporary sprite PNG).
Simon Cross <hodgestar@gmail.com>
parents: 57
diff changeset
773
109
48019afde338 Equipment purchasing and some toolbar tweaks.
Jeremy Thurgood <firxen@gmail.com>
parents: 108
diff changeset
774 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
775
109
48019afde338 Equipment purchasing and some toolbar tweaks.
Jeremy Thurgood <firxen@gmail.com>
parents: 108
diff changeset
776 equipment = equipment_cls()
298
88a626202591 Buy equipment for chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 294
diff changeset
777
310
49c58dda8ac2 Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents: 307
diff changeset
778 def do_equip(chicken, update_button=None):
298
88a626202591 Buy equipment for chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 294
diff changeset
779 # 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
780 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
781 return False
298
88a626202591 Buy equipment for chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 294
diff changeset
782 if equipment.place(chicken):
88a626202591 Buy equipment for chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 294
diff changeset
783 self.add_cash(-equipment.buy_price())
88a626202591 Buy equipment for chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 294
diff changeset
784 chicken.equip(equipment)
310
49c58dda8ac2 Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents: 307
diff changeset
785 if update_button:
49c58dda8ac2 Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents: 307
diff changeset
786 update_button(chicken)
298
88a626202591 Buy equipment for chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 294
diff changeset
787 return False
88a626202591 Buy equipment for chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 294
diff changeset
788
472
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
789 if tile_pos:
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
790 chicken = self.get_outside_chicken(tile_pos)
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
791 if chicken is None:
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
792 building = self.get_building(tile_pos)
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
793 if not (building and building.ABODE):
524
1eed8c861580 Fix some indentation weirdnesses that have crept in
Neil Muller <drnlmuller@gmail.com>
parents: 523
diff changeset
794 return
472
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
795 # Bounce through open dialog once more
474
a50b53983389 Allow moving multiple animals more easily
Neil Muller <drnlmuller@gmail.com>
parents: 473
diff changeset
796 self.open_building_dialog(building, False, do_equip)
472
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
797 else:
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
798 do_equip(chicken)
298
88a626202591 Buy equipment for chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 294
diff changeset
799 else:
472
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
800 for chicken in self.selected_chickens:
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
801 do_equip(chicken)
109
48019afde338 Equipment purchasing and some toolbar tweaks.
Jeremy Thurgood <firxen@gmail.com>
parents: 108
diff changeset
802
65
7e9c8ad06d32 Implement building selling.
Simon Cross <hodgestar@gmail.com>
parents: 64
diff changeset
803 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
804 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
805 if building is None:
7910b4e01dba Add chicken moving tool and start of animal placement.
Simon Cross <hodgestar@gmail.com>
parents: 98
diff changeset
806 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
807 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
808 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
809 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
810 return
428
a356e57529ea buildings cost wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 425
diff changeset
811 self.add_wood(building.sell_price())
557
50d6c68ce267 Add gameboard to buildings. Update save version as this breaks old save games
Neil Muller <drnlmuller@gmail.com>
parents: 556
diff changeset
812 building.remove()
105
7910b4e01dba Add chicken moving tool and start of animal placement.
Simon Cross <hodgestar@gmail.com>
parents: 98
diff changeset
813 self.remove_building(building)
65
7e9c8ad06d32 Implement building selling.
Simon Cross <hodgestar@gmail.com>
parents: 64
diff changeset
814
378
71f5897ac5ef Fences are now buildings, with appropriate (but ugly) UI changes.
Jeremy Thurgood <firxen@gmail.com>
parents: 361
diff changeset
815 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
816 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
817 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
818 return
428
a356e57529ea buildings cost wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 425
diff changeset
819 if self.wood < building.repair_price():
a356e57529ea buildings cost wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 425
diff changeset
820 return
a356e57529ea buildings cost wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 425
diff changeset
821 self.add_wood(-building.repair_price())
557
50d6c68ce267 Add gameboard to buildings. Update save version as this breaks old save games
Neil Muller <drnlmuller@gmail.com>
parents: 556
diff changeset
822 building.repair()
378
71f5897ac5ef Fences are now buildings, with appropriate (but ugly) UI changes.
Jeremy Thurgood <firxen@gmail.com>
parents: 361
diff changeset
823
164
ab90040013a7 Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents: 162
diff changeset
824 def sell_equipment(self, tile_pos):
302
01c1682dc250 Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 298
diff changeset
825 x, y = 0, 0
310
49c58dda8ac2 Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents: 307
diff changeset
826 def do_sell(chicken, update_button=None):
302
01c1682dc250 Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 298
diff changeset
827 if not chicken.equipment:
01c1682dc250 Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 298
diff changeset
828 return
01c1682dc250 Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 298
diff changeset
829 elif len(chicken.equipment) == 1:
01c1682dc250 Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 298
diff changeset
830 item = chicken.equipment[0]
01c1682dc250 Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 298
diff changeset
831 self.add_cash(item.sell_price())
01c1682dc250 Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 298
diff changeset
832 chicken.unequip(item)
310
49c58dda8ac2 Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents: 307
diff changeset
833 if update_button:
49c58dda8ac2 Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents: 307
diff changeset
834 update_button(chicken)
302
01c1682dc250 Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 298
diff changeset
835 else:
310
49c58dda8ac2 Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents: 307
diff changeset
836 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
837 return False
506
3b5717d742b2 fixed selling of equipment from selected chickens
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 504
diff changeset
838 if tile_pos:
3b5717d742b2 fixed selling of equipment from selected chickens
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 504
diff changeset
839 chicken = self.get_outside_chicken(tile_pos)
3b5717d742b2 fixed selling of equipment from selected chickens
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 504
diff changeset
840 if chicken is not None:
3b5717d742b2 fixed selling of equipment from selected chickens
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 504
diff changeset
841 do_sell(chicken)
3b5717d742b2 fixed selling of equipment from selected chickens
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 504
diff changeset
842 else:
3b5717d742b2 fixed selling of equipment from selected chickens
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 504
diff changeset
843 building = self.get_building(tile_pos)
527
f59cb047d08f Don't try to open non-abodes.
Simon Cross <hodgestar@gmail.com>
parents: 526
diff changeset
844 if building is None or not building.ABODE:
506
3b5717d742b2 fixed selling of equipment from selected chickens
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 504
diff changeset
845 return
3b5717d742b2 fixed selling of equipment from selected chickens
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 504
diff changeset
846 x, y = 50, 0
3b5717d742b2 fixed selling of equipment from selected chickens
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 504
diff changeset
847 self.open_building_dialog(building, False, do_sell)
164
ab90040013a7 Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents: 162
diff changeset
848 else:
506
3b5717d742b2 fixed selling of equipment from selected chickens
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 504
diff changeset
849 for chicken in self.selected_chickens[:]:
3b5717d742b2 fixed selling of equipment from selected chickens
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 504
diff changeset
850 do_sell(chicken)
164
ab90040013a7 Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents: 162
diff changeset
851
310
49c58dda8ac2 Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents: 307
diff changeset
852 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
853 tbl = gui.Table()
ab90040013a7 Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents: 162
diff changeset
854
ab90040013a7 Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents: 162
diff changeset
855 def sell_item(item, button):
ab90040013a7 Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents: 162
diff changeset
856 """Select item of equipment."""
ab90040013a7 Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents: 162
diff changeset
857 self.add_cash(item.sell_price())
ab90040013a7 Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents: 162
diff changeset
858 chicken.unequip(item)
310
49c58dda8ac2 Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents: 307
diff changeset
859 if update_button:
49c58dda8ac2 Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents: 307
diff changeset
860 update_button(chicken)
169
946f09ed37cd Make equipment dialog close after selecting an item to sell.
Simon Cross <hodgestar@gmail.com>
parents: 168
diff changeset
861 self.disp.close(dialog)
164
ab90040013a7 Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents: 162
diff changeset
862
ab90040013a7 Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents: 162
diff changeset
863 kwargs = { 'style': { 'padding_left': 10, 'padding_bottom': 10 }}
ab90040013a7 Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents: 162
diff changeset
864
ab90040013a7 Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents: 162
diff changeset
865 tbl.tr()
ab90040013a7 Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents: 162
diff changeset
866 tbl.td(gui.Button("Sell ... "), align=-1, **kwargs)
ab90040013a7 Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents: 162
diff changeset
867
ab90040013a7 Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents: 162
diff changeset
868 for item in chicken.equipment:
ab90040013a7 Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents: 162
diff changeset
869 tbl.tr()
ab90040013a7 Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents: 162
diff changeset
870 button = gui.Button(item.name().title())
ab90040013a7 Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents: 162
diff changeset
871 button.connect(gui.CLICK, sell_item, item, button)
ab90040013a7 Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents: 162
diff changeset
872 tbl.td(button, align=1, **kwargs)
ab90040013a7 Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents: 162
diff changeset
873
302
01c1682dc250 Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 298
diff changeset
874 dialog = self.open_dialog(tbl, x=x, y=y)
164
ab90040013a7 Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents: 162
diff changeset
875
14
d7f295c06a4b Split gameboard screen.
Jeremy Thurgood <firxen@gmail.com>
parents: 12
diff changeset
876 def event(self, e):
548
27c09c58d89d Remove gameboard and dialog event flow hacks.
Simon Cross <hodgestar@gmail.com>
parents: 544
diff changeset
877 if e.type == KEYDOWN and e.key == K_ESCAPE:
27c09c58d89d Remove gameboard and dialog event flow hacks.
Simon Cross <hodgestar@gmail.com>
parents: 544
diff changeset
878 def sure(val):
27c09c58d89d Remove gameboard and dialog event flow hacks.
Simon Cross <hodgestar@gmail.com>
parents: 544
diff changeset
879 if val:
27c09c58d89d Remove gameboard and dialog event flow hacks.
Simon Cross <hodgestar@gmail.com>
parents: 544
diff changeset
880 import engine
27c09c58d89d Remove gameboard and dialog event flow hacks.
Simon Cross <hodgestar@gmail.com>
parents: 544
diff changeset
881 pygame.event.post(engine.GO_GAME_OVER)
553
7963fc09fac2 Make checkdialog take strings to show as input. Add possiblity of 3rd button on dialog
Neil Muller <drnlmuller@gmail.com>
parents: 552
diff changeset
882 dialog = misc.CheckDialog(sure,
7963fc09fac2 Make checkdialog take strings to show as input. Add possiblity of 3rd button on dialog
Neil Muller <drnlmuller@gmail.com>
parents: 552
diff changeset
883 "Do you REALLY want to exit this game?",
7963fc09fac2 Make checkdialog take strings to show as input. Add possiblity of 3rd button on dialog
Neil Muller <drnlmuller@gmail.com>
parents: 552
diff changeset
884 "Yes, Quit", "No, Don't Quit", None)
548
27c09c58d89d Remove gameboard and dialog event flow hacks.
Simon Cross <hodgestar@gmail.com>
parents: 544
diff changeset
885 self.disp.open(dialog)
27c09c58d89d Remove gameboard and dialog event flow hacks.
Simon Cross <hodgestar@gmail.com>
parents: 544
diff changeset
886 return True
27c09c58d89d Remove gameboard and dialog event flow hacks.
Simon Cross <hodgestar@gmail.com>
parents: 544
diff changeset
887 elif e.type == KEYDOWN and e.key == K_n and self.day:
27c09c58d89d Remove gameboard and dialog event flow hacks.
Simon Cross <hodgestar@gmail.com>
parents: 544
diff changeset
888 import engine
27c09c58d89d Remove gameboard and dialog event flow hacks.
Simon Cross <hodgestar@gmail.com>
parents: 544
diff changeset
889 pygame.event.post(engine.START_NIGHT)
27c09c58d89d Remove gameboard and dialog event flow hacks.
Simon Cross <hodgestar@gmail.com>
parents: 544
diff changeset
890 return True
27c09c58d89d Remove gameboard and dialog event flow hacks.
Simon Cross <hodgestar@gmail.com>
parents: 544
diff changeset
891 elif e.type == KEYDOWN and e.key == K_d and self.night:
27c09c58d89d Remove gameboard and dialog event flow hacks.
Simon Cross <hodgestar@gmail.com>
parents: 544
diff changeset
892 import engine
27c09c58d89d Remove gameboard and dialog event flow hacks.
Simon Cross <hodgestar@gmail.com>
parents: 544
diff changeset
893 pygame.event.post(engine.FAST_FORWARD)
27c09c58d89d Remove gameboard and dialog event flow hacks.
Simon Cross <hodgestar@gmail.com>
parents: 544
diff changeset
894 return True
27c09c58d89d Remove gameboard and dialog event flow hacks.
Simon Cross <hodgestar@gmail.com>
parents: 544
diff changeset
895 elif 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
896 if e.key == K_UP:
433
8643893635e7 Seperate toolbar and gameboard
Neil Muller <drnlmuller@gmail.com>
parents: 428
diff changeset
897 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
898 if e.key == K_DOWN:
433
8643893635e7 Seperate toolbar and gameboard
Neil Muller <drnlmuller@gmail.com>
parents: 428
diff changeset
899 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
900 if e.key == K_LEFT:
433
8643893635e7 Seperate toolbar and gameboard
Neil Muller <drnlmuller@gmail.com>
parents: 428
diff changeset
901 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
902 if e.key == K_RIGHT:
433
8643893635e7 Seperate toolbar and gameboard
Neil Muller <drnlmuller@gmail.com>
parents: 428
diff changeset
903 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
904 return True
489
3c9c664ccb85 selection groups
Neil Muller <drnlmuller@gmail.com>
parents: 488
diff changeset
905 elif e.type == KEYDOWN and e.key in \
3c9c664ccb85 selection groups
Neil Muller <drnlmuller@gmail.com>
parents: 488
diff changeset
906 [K_0, K_1, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9]:
524
1eed8c861580 Fix some indentation weirdnesses that have crept in
Neil Muller <drnlmuller@gmail.com>
parents: 523
diff changeset
907 mods = pygame.key.get_mods()
528
04975aa3ec70 Alt also sets groups, because jerith has a weird OS setup.
Jeremy Thurgood <firxen@gmail.com>
parents: 527
diff changeset
908 if (mods & KMOD_CTRL) or (mods & KMOD_ALT):
524
1eed8c861580 Fix some indentation weirdnesses that have crept in
Neil Muller <drnlmuller@gmail.com>
parents: 523
diff changeset
909 # store current selection
1eed8c861580 Fix some indentation weirdnesses that have crept in
Neil Muller <drnlmuller@gmail.com>
parents: 523
diff changeset
910 self.stored_selections[e.key] = self.selected_chickens[:]
1eed8c861580 Fix some indentation weirdnesses that have crept in
Neil Muller <drnlmuller@gmail.com>
parents: 523
diff changeset
911 else:
542
baf75d5ee50d Shift+group to add to current selection.
Jeremy Thurgood <firxen@gmail.com>
parents: 541
diff changeset
912 additive = (mods & KMOD_SHIFT)
baf75d5ee50d Shift+group to add to current selection.
Jeremy Thurgood <firxen@gmail.com>
parents: 541
diff changeset
913 self.restore_selection(self.stored_selections.get(e.key, []), additive)
541
450de9dfa106 Move gameboard event prodding into the widgets - better matches pgu internals
Neil Muller <drnlmuller@gmail.com>
parents: 539
diff changeset
914 return True
521
787eb032bf8a Cursor hint for Ctrl-click move
Neil Muller <drnlmuller@gmail.com>
parents: 519
diff changeset
915 elif e.type == KEYDOWN:
524
1eed8c861580 Fix some indentation weirdnesses that have crept in
Neil Muller <drnlmuller@gmail.com>
parents: 523
diff changeset
916 mods = pygame.key.get_mods()
1eed8c861580 Fix some indentation weirdnesses that have crept in
Neil Muller <drnlmuller@gmail.com>
parents: 523
diff changeset
917 if mods & KMOD_CTRL and self.selected_tool == constants.TOOL_SELECT_CHICKENS and self.selected_chickens:
521
787eb032bf8a Cursor hint for Ctrl-click move
Neil Muller <drnlmuller@gmail.com>
parents: 519
diff changeset
918 pygame.mouse.set_cursor(*cursors.cursors['chicken'])
787eb032bf8a Cursor hint for Ctrl-click move
Neil Muller <drnlmuller@gmail.com>
parents: 519
diff changeset
919 elif e.type == KEYUP:
524
1eed8c861580 Fix some indentation weirdnesses that have crept in
Neil Muller <drnlmuller@gmail.com>
parents: 523
diff changeset
920 mods = pygame.key.get_mods()
1eed8c861580 Fix some indentation weirdnesses that have crept in
Neil Muller <drnlmuller@gmail.com>
parents: 523
diff changeset
921 if not (mods & KMOD_CTRL) and self.selected_tool == constants.TOOL_SELECT_CHICKENS:
521
787eb032bf8a Cursor hint for Ctrl-click move
Neil Muller <drnlmuller@gmail.com>
parents: 519
diff changeset
922 pygame.mouse.set_cursor(*cursors.cursors['select'])
262
d508248041ff avoid passing events in twice
Neil Muller <drnlmuller@gmail.com>
parents: 258
diff changeset
923 return False
25
6d6ab0c1479d Add placing some chickens and foxes
Neil Muller <drnlmuller@gmail.com>
parents: 24
diff changeset
924
542
baf75d5ee50d Shift+group to add to current selection.
Jeremy Thurgood <firxen@gmail.com>
parents: 541
diff changeset
925 def restore_selection(self, selection, additive=False):
baf75d5ee50d Shift+group to add to current selection.
Jeremy Thurgood <firxen@gmail.com>
parents: 541
diff changeset
926 if not additive:
baf75d5ee50d Shift+group to add to current selection.
Jeremy Thurgood <firxen@gmail.com>
parents: 541
diff changeset
927 self.unselect_all()
489
3c9c664ccb85 selection groups
Neil Muller <drnlmuller@gmail.com>
parents: 488
diff changeset
928 for chick in selection[:]:
3c9c664ccb85 selection groups
Neil Muller <drnlmuller@gmail.com>
parents: 488
diff changeset
929 if chick in self.chickens:
3c9c664ccb85 selection groups
Neil Muller <drnlmuller@gmail.com>
parents: 488
diff changeset
930 self.select_animal(chick)
3c9c664ccb85 selection groups
Neil Muller <drnlmuller@gmail.com>
parents: 488
diff changeset
931 else:
3c9c664ccb85 selection groups
Neil Muller <drnlmuller@gmail.com>
parents: 488
diff changeset
932 # Update stored selection
3c9c664ccb85 selection groups
Neil Muller <drnlmuller@gmail.com>
parents: 488
diff changeset
933 selection.remove(chick)
3c9c664ccb85 selection groups
Neil Muller <drnlmuller@gmail.com>
parents: 488
diff changeset
934
139
1d73de63bd71 Add basic game over screen
Neil Muller <drnlmuller@gmail.com>
parents: 135
diff changeset
935 def advance_day(self):
1d73de63bd71 Add basic game over screen
Neil Muller <drnlmuller@gmail.com>
parents: 135
diff changeset
936 self.days += 1
1d73de63bd71 Add basic game over screen
Neil Muller <drnlmuller@gmail.com>
parents: 135
diff changeset
937
552
11c4cebfe4c5 Preparatory work for woodland biodiversity.
Jeremy Thurgood <firxen@gmail.com>
parents: 548
diff changeset
938 def is_woodland_tile(self, pos):
11c4cebfe4c5 Preparatory work for woodland biodiversity.
Jeremy Thurgood <firxen@gmail.com>
parents: 548
diff changeset
939 return tiles.TILE_MAP[self.tv.get(pos.to_tile_tuple())] == 'woodland'
11c4cebfe4c5 Preparatory work for woodland biodiversity.
Jeremy Thurgood <firxen@gmail.com>
parents: 548
diff changeset
940
25
6d6ab0c1479d Add placing some chickens and foxes
Neil Muller <drnlmuller@gmail.com>
parents: 24
diff changeset
941 def clear_foxes(self):
116
d539ef5a3333 Add basic chicken->egg cycle
Neil Muller <drnlmuller@gmail.com>
parents: 115
diff changeset
942 for fox in self.foxes.copy():
80
ad9d1bc7ef0c Kill foxes that don't reach safety
Neil Muller <drnlmuller@gmail.com>
parents: 79
diff changeset
943 # 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
944 # killed
552
11c4cebfe4c5 Preparatory work for woodland biodiversity.
Jeremy Thurgood <firxen@gmail.com>
parents: 548
diff changeset
945 if self.in_bounds(fox.pos) and not self.is_woodland_tile(fox.pos):
84
5494af02a0e8 Chickens with rifles!
Jeremy Thurgood <firxen@gmail.com>
parents: 83
diff changeset
946 self.kill_fox(fox)
5494af02a0e8 Chickens with rifles!
Jeremy Thurgood <firxen@gmail.com>
parents: 83
diff changeset
947 else:
397
532f1ea476ff Make foxes enter buildings, with a seperate count for them
Neil Muller <drnlmuller@gmail.com>
parents: 396
diff changeset
948 self.remove_fox(fox)
116
d539ef5a3333 Add basic chicken->egg cycle
Neil Muller <drnlmuller@gmail.com>
parents: 115
diff changeset
949 self.foxes = set() # Remove all the foxes
25
6d6ab0c1479d Add placing some chickens and foxes
Neil Muller <drnlmuller@gmail.com>
parents: 24
diff changeset
950
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
951 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
952 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
953 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
954
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
955 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
956 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
957 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
958
396
19e583e5cdc0 Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents: 395
diff changeset
959 def do_night_step(self):
19e583e5cdc0 Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents: 395
diff changeset
960 """Handle the events of the night.
19e583e5cdc0 Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents: 395
diff changeset
961
122
d2b19131d537 Don't continue the night if we're not doing anything anymore
Neil Muller <drnlmuller@gmail.com>
parents: 119
diff changeset
962 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
963 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
964 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
965 return True
396
19e583e5cdc0 Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents: 395
diff changeset
966 # Move all the foxes
19e583e5cdc0 Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents: 395
diff changeset
967 over = self.foxes_move()
19e583e5cdc0 Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents: 395
diff changeset
968 if not over:
19e583e5cdc0 Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents: 395
diff changeset
969 self.foxes_attack()
19e583e5cdc0 Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents: 395
diff changeset
970 self.chickens_attack()
19e583e5cdc0 Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents: 395
diff changeset
971 return over
19e583e5cdc0 Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents: 395
diff changeset
972
401
7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on
Neil Muller <drnlmuller@gmail.com>
parents: 400
diff changeset
973 def _cache_animal_positions(self):
399
3294929223bd Cache fox positions to avoid a repeated loop
Neil Muller <drnlmuller@gmail.com>
parents: 397
diff changeset
974 """Cache the current set of fox positions for the avoiding checks"""
456
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
975 self._pos_cache.clear()
399
3294929223bd Cache fox positions to avoid a repeated loop
Neil Muller <drnlmuller@gmail.com>
parents: 397
diff changeset
976 for fox in self.foxes:
456
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
977 self._pos_cache.add(fox, '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
978 for chick in self.chickens:
456
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
979 self._pos_cache.add(chick, 'chicken')
399
3294929223bd Cache fox positions to avoid a repeated loop
Neil Muller <drnlmuller@gmail.com>
parents: 397
diff changeset
980
456
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
981 def get_animal_at_pos(self, pos, animal_type):
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
982 return self._pos_cache.get(pos, animal_type)
399
3294929223bd Cache fox positions to avoid a repeated loop
Neil Muller <drnlmuller@gmail.com>
parents: 397
diff changeset
983
422
ab4fc3fe0f96 chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 421
diff changeset
984 def chickens_scatter(self):
ab4fc3fe0f96 chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 421
diff changeset
985 """Chickens outside move around randomly a bit"""
ab4fc3fe0f96 chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 421
diff changeset
986 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
987 old_pos = chicken.pos
476
3dae0fc14009 Animals have their own gameboard references instead of lugging them around in params all the time.
Jeremy Thurgood <firxen@gmail.com>
parents: 475
diff changeset
988 chicken.move()
456
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
989 self._pos_cache.update(old_pos, chicken, 'chicken')
422
ab4fc3fe0f96 chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 421
diff changeset
990
ab4fc3fe0f96 chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 421
diff changeset
991 def chickens_chop_wood(self):
ab4fc3fe0f96 chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 421
diff changeset
992 """Chickens with axes chop down trees near them"""
ab4fc3fe0f96 chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 421
diff changeset
993 for chicken in [chick for chick in self.chickens if chick.outside()]:
476
3dae0fc14009 Animals have their own gameboard references instead of lugging them around in params all the time.
Jeremy Thurgood <firxen@gmail.com>
parents: 475
diff changeset
994 chicken.chop()
460
7204c16ab64d Wood market!
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 457
diff changeset
995 self.calculate_wood_groat_exchange_rate()
422
ab4fc3fe0f96 chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 421
diff changeset
996
396
19e583e5cdc0 Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents: 395
diff changeset
997 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
998 over = True
530
c1f14fa35d30 Avoid buglet where sprite isn't properly removed for a safe fox
Neil Muller <drnlmuller@gmail.com>
parents: 528
diff changeset
999 for fox in self.foxes.copy():
399
3294929223bd Cache fox positions to avoid a repeated loop
Neil Muller <drnlmuller@gmail.com>
parents: 397
diff changeset
1000 old_pos = fox.pos
476
3dae0fc14009 Animals have their own gameboard references instead of lugging them around in params all the time.
Jeremy Thurgood <firxen@gmail.com>
parents: 475
diff changeset
1001 fox.move()
122
d2b19131d537 Don't continue the night if we're not doing anything anymore
Neil Muller <drnlmuller@gmail.com>
parents: 119
diff changeset
1002 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
1003 over = False
530
c1f14fa35d30 Avoid buglet where sprite isn't properly removed for a safe fox
Neil Muller <drnlmuller@gmail.com>
parents: 528
diff changeset
1004 self._pos_cache.update(old_pos, fox, 'fox')
c1f14fa35d30 Avoid buglet where sprite isn't properly removed for a safe fox
Neil Muller <drnlmuller@gmail.com>
parents: 528
diff changeset
1005 else:
c1f14fa35d30 Avoid buglet where sprite isn't properly removed for a safe fox
Neil Muller <drnlmuller@gmail.com>
parents: 528
diff changeset
1006 # Avoid stale fox on board edge
c1f14fa35d30 Avoid buglet where sprite isn't properly removed for a safe fox
Neil Muller <drnlmuller@gmail.com>
parents: 528
diff changeset
1007 self.remove_fox(fox)
396
19e583e5cdc0 Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents: 395
diff changeset
1008 return over
19e583e5cdc0 Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents: 395
diff changeset
1009
19e583e5cdc0 Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents: 395
diff changeset
1010 def foxes_attack(self):
19e583e5cdc0 Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents: 395
diff changeset
1011 for fox in self.foxes:
476
3dae0fc14009 Animals have their own gameboard references instead of lugging them around in params all the time.
Jeremy Thurgood <firxen@gmail.com>
parents: 475
diff changeset
1012 fox.attack()
396
19e583e5cdc0 Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents: 395
diff changeset
1013
19e583e5cdc0 Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents: 395
diff changeset
1014 def chickens_attack(self):
84
5494af02a0e8 Chickens with rifles!
Jeremy Thurgood <firxen@gmail.com>
parents: 83
diff changeset
1015 for chicken in self.chickens:
476
3dae0fc14009 Animals have their own gameboard references instead of lugging them around in params all the time.
Jeremy Thurgood <firxen@gmail.com>
parents: 475
diff changeset
1016 chicken.attack()
29
2e88c680672c Minimal fox raid logic
Neil Muller <drnlmuller@gmail.com>
parents: 25
diff changeset
1017
25
6d6ab0c1479d Add placing some chickens and foxes
Neil Muller <drnlmuller@gmail.com>
parents: 24
diff changeset
1018 def add_chicken(self, chicken):
116
d539ef5a3333 Add basic chicken->egg cycle
Neil Muller <drnlmuller@gmail.com>
parents: 115
diff changeset
1019 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
1020 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
1021 self.tv.sprites.append(chicken)
424
fbef17cab632 Use fully rendered map in gameboard choosing screen
Neil Muller <drnlmuller@gmail.com>
parents: 422
diff changeset
1022 if self.disp:
fbef17cab632 Use fully rendered map in gameboard choosing screen
Neil Muller <drnlmuller@gmail.com>
parents: 422
diff changeset
1023 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
1024
6d6ab0c1479d Add placing some chickens and foxes
Neil Muller <drnlmuller@gmail.com>
parents: 24
diff changeset
1025 def add_fox(self, fox):
116
d539ef5a3333 Add basic chicken->egg cycle
Neil Muller <drnlmuller@gmail.com>
parents: 115
diff changeset
1026 self.foxes.add(fox)
25
6d6ab0c1479d Add placing some chickens and foxes
Neil Muller <drnlmuller@gmail.com>
parents: 24
diff changeset
1027 self.tv.sprites.append(fox)
29
2e88c680672c Minimal fox raid logic
Neil Muller <drnlmuller@gmail.com>
parents: 25
diff changeset
1028
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
1029 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
1030 self.buildings.add(building)
381
7a58dadfd251 little cleanups, every sprite in its proper layer.
Jeremy Thurgood <firxen@gmail.com>
parents: 380
diff changeset
1031 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
1032
419
d110d55c8449 Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents: 414
diff changeset
1033 def place_hatched_chicken(self, new_chick, building):
d110d55c8449 Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents: 414
diff changeset
1034 try:
d110d55c8449 Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents: 414
diff changeset
1035 building.add_occupant(new_chick)
d110d55c8449 Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents: 414
diff changeset
1036 self.add_chicken(new_chick)
d110d55c8449 Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents: 414
diff changeset
1037 new_chick.equip(equipment.Nest())
536
1a224ba50edf Correctly set the position of newly hatched chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents: 530
diff changeset
1038 new_chick.set_pos(new_chick.abode.get_pos())
419
d110d55c8449 Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents: 414
diff changeset
1039 except buildings.BuildingFullError:
d110d55c8449 Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents: 414
diff changeset
1040 # No space in the hen house, look nearby
d110d55c8449 Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents: 414
diff changeset
1041 for tile_pos in building.adjacent_tiles():
d110d55c8449 Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents: 414
diff changeset
1042 if self.tv.get(tile_pos) != self.GRASSLAND:
d110d55c8449 Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents: 414
diff changeset
1043 continue
d110d55c8449 Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents: 414
diff changeset
1044 if self.get_outside_chicken(tile_pos) is None:
d110d55c8449 Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents: 414
diff changeset
1045 self.add_chicken(new_chick)
d110d55c8449 Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents: 414
diff changeset
1046 self.relocate_animal(new_chick, tile_pos=tile_pos)
d110d55c8449 Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents: 414
diff changeset
1047 break
d110d55c8449 Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents: 414
diff changeset
1048 # if there isn't a space for the
d110d55c8449 Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents: 414
diff changeset
1049 # new chick it dies. :/ Farm life
d110d55c8449 Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents: 414
diff changeset
1050 # is cruel.
116
d539ef5a3333 Add basic chicken->egg cycle
Neil Muller <drnlmuller@gmail.com>
parents: 115
diff changeset
1051
84
5494af02a0e8 Chickens with rifles!
Jeremy Thurgood <firxen@gmail.com>
parents: 83
diff changeset
1052 def kill_fox(self, fox):
251
844bfb23d4b6 Refactored animal death and added death animations.
Jeremy Thurgood <firxen@gmail.com>
parents: 247
diff changeset
1053 self.killed_foxes += 1
844bfb23d4b6 Refactored animal death and added death animations.
Jeremy Thurgood <firxen@gmail.com>
parents: 247
diff changeset
1054 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
1055 self.add_cash(self.level.sell_price_dead_fox)
251
844bfb23d4b6 Refactored animal death and added death animations.
Jeremy Thurgood <firxen@gmail.com>
parents: 247
diff changeset
1056 self.remove_fox(fox)
84
5494af02a0e8 Chickens with rifles!
Jeremy Thurgood <firxen@gmail.com>
parents: 83
diff changeset
1057
29
2e88c680672c Minimal fox raid logic
Neil Muller <drnlmuller@gmail.com>
parents: 25
diff changeset
1058 def remove_fox(self, fox):
456
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
1059 self._pos_cache.remove(fox.pos, 'fox')
116
d539ef5a3333 Add basic chicken->egg cycle
Neil Muller <drnlmuller@gmail.com>
parents: 115
diff changeset
1060 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
1061 if fox.building:
532f1ea476ff Make foxes enter buildings, with a seperate count for them
Neil Muller <drnlmuller@gmail.com>
parents: 396
diff changeset
1062 fox.building.remove_predator(fox)
116
d539ef5a3333 Add basic chicken->egg cycle
Neil Muller <drnlmuller@gmail.com>
parents: 115
diff changeset
1063 if fox in self.tv.sprites:
29
2e88c680672c Minimal fox raid logic
Neil Muller <drnlmuller@gmail.com>
parents: 25
diff changeset
1064 self.tv.sprites.remove(fox)
2e88c680672c Minimal fox raid logic
Neil Muller <drnlmuller@gmail.com>
parents: 25
diff changeset
1065
2e88c680672c Minimal fox raid logic
Neil Muller <drnlmuller@gmail.com>
parents: 25
diff changeset
1066 def remove_chicken(self, chick):
472
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
1067 if chick in self.selected_chickens:
67574723427e Partially working (but much less crashy) multiple select support
Neil Muller <drnlmuller@gmail.com>
parents: 470
diff changeset
1068 self.unselect_animal(chick)
116
d539ef5a3333 Add basic chicken->egg cycle
Neil Muller <drnlmuller@gmail.com>
parents: 115
diff changeset
1069 self.chickens.discard(chick)
243
4f86c2616cdf Variable number of eggs for chickens
Neil Muller <drnlmuller@gmail.com>
parents: 241
diff changeset
1070 self.eggs -= chick.get_num_eggs()
4f86c2616cdf Variable number of eggs for chickens
Neil Muller <drnlmuller@gmail.com>
parents: 241
diff changeset
1071 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
1072 if chick.abode:
125
2e3a05b9594d Chickens in buildings\!
Simon Cross <hodgestar@gmail.com>
parents: 124
diff changeset
1073 chick.abode.clear_occupant()
116
d539ef5a3333 Add basic chicken->egg cycle
Neil Muller <drnlmuller@gmail.com>
parents: 115
diff changeset
1074 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
1075 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
1076 self.tv.sprites.remove(chick)
456
96dbf2c8506e Factor position cache out into its own class, make Position more useful.
Jeremy Thurgood <firxen@gmail.com>
parents: 453
diff changeset
1077 self._pos_cache.remove(chick.pos, 'chicken')
40
678421bd58ee Money counter with very ugly display hack.
Jeremy Thurgood <firxen@gmail.com>
parents: 39
diff changeset
1078
65
7e9c8ad06d32 Implement building selling.
Simon Cross <hodgestar@gmail.com>
parents: 64
diff changeset
1079 def remove_building(self, building):
7e9c8ad06d32 Implement building selling.
Simon Cross <hodgestar@gmail.com>
parents: 64
diff changeset
1080 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
1081 self.buildings.discard(building)
381
7a58dadfd251 little cleanups, every sprite in its proper layer.
Jeremy Thurgood <firxen@gmail.com>
parents: 380
diff changeset
1082 self.tv.sprites.remove(building, layer='buildings')
65
7e9c8ad06d32 Implement building selling.
Simon Cross <hodgestar@gmail.com>
parents: 64
diff changeset
1083
40
678421bd58ee Money counter with very ugly display hack.
Jeremy Thurgood <firxen@gmail.com>
parents: 39
diff changeset
1084 def add_cash(self, amount):
678421bd58ee Money counter with very ugly display hack.
Jeremy Thurgood <firxen@gmail.com>
parents: 39
diff changeset
1085 self.cash += amount
678421bd58ee Money counter with very ugly display hack.
Jeremy Thurgood <firxen@gmail.com>
parents: 39
diff changeset
1086 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
1087
422
ab4fc3fe0f96 chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 421
diff changeset
1088 def add_wood(self, planks):
ab4fc3fe0f96 chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 421
diff changeset
1089 self.wood += planks
ab4fc3fe0f96 chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 421
diff changeset
1090 self.toolbar.update_wood_counter(self.wood)
ab4fc3fe0f96 chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 421
diff changeset
1091
408
02a6de5629d6 Levels can include starting equipment
Neil Muller <drnlmuller@gmail.com>
parents: 405
diff changeset
1092 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
1093 """Add chickens as specified by the code layer"""
476
3dae0fc14009 Animals have their own gameboard references instead of lugging them around in params all the time.
Jeremy Thurgood <firxen@gmail.com>
parents: 475
diff changeset
1094 chick = animal.Chicken((tile.tx, tile.ty), self)
408
02a6de5629d6 Levels can include starting equipment
Neil Muller <drnlmuller@gmail.com>
parents: 405
diff changeset
1095 for equip_cls in equipment.EQUIP_MAP[value]:
02a6de5629d6 Levels can include starting equipment
Neil Muller <drnlmuller@gmail.com>
parents: 405
diff changeset
1096 item = equip_cls()
02a6de5629d6 Levels can include starting equipment
Neil Muller <drnlmuller@gmail.com>
parents: 405
diff changeset
1097 chick.equip(item)
382
e89e6ad011ac Use code layer to place chickens
Neil Muller <drnlmuller@gmail.com>
parents: 381
diff changeset
1098 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
1099
241
1a7000c8211c Demolition foxes, including better fox selection.
Jeremy Thurgood <firxen@gmail.com>
parents: 239
diff changeset
1100 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
1101 fox_cls = misc.WeightedSelection(self.level.fox_weightings).choose()
476
3dae0fc14009 Animals have their own gameboard references instead of lugging them around in params all the time.
Jeremy Thurgood <firxen@gmail.com>
parents: 475
diff changeset
1102 return fox_cls((x, y), self)
241
1a7000c8211c Demolition foxes, including better fox selection.
Jeremy Thurgood <firxen@gmail.com>
parents: 239
diff changeset
1103
69
18db99fda6bd Move spawing code from engine to gameboard - seems more natural.
Neil Muller <drnlmuller@gmail.com>
parents: 68
diff changeset
1104 def spawn_foxes(self):
18db99fda6bd Move spawing code from engine to gameboard - seems more natural.
Neil Muller <drnlmuller@gmail.com>
parents: 68
diff changeset
1105 """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
1106 # 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
1107 x, y = 0, 0
18db99fda6bd Move spawing code from engine to gameboard - seems more natural.
Neil Muller <drnlmuller@gmail.com>
parents: 68
diff changeset
1108 width, height = self.tv.size
389
463802281182 Add basic level support (level choosing needs work)
Neil Muller <drnlmuller@gmail.com>
parents: 382
diff changeset
1109 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
1110 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
1111 while len(self.foxes) < new_foxes:
73
f3ce3346e25e Spawn foxes jsut outside the map
Neil Muller <drnlmuller@gmail.com>
parents: 69
diff changeset
1112 side = random.randint(0, 3)
f3ce3346e25e Spawn foxes jsut outside the map
Neil Muller <drnlmuller@gmail.com>
parents: 69
diff changeset
1113 if side == 0:
f3ce3346e25e Spawn foxes jsut outside the map
Neil Muller <drnlmuller@gmail.com>
parents: 69
diff changeset
1114 # top
f3ce3346e25e Spawn foxes jsut outside the map
Neil Muller <drnlmuller@gmail.com>
parents: 69
diff changeset
1115 y = -1
f3ce3346e25e Spawn foxes jsut outside the map
Neil Muller <drnlmuller@gmail.com>
parents: 69
diff changeset
1116 x = random.randint(-1, width)
f3ce3346e25e Spawn foxes jsut outside the map
Neil Muller <drnlmuller@gmail.com>
parents: 69
diff changeset
1117 elif side == 1:
f3ce3346e25e Spawn foxes jsut outside the map
Neil Muller <drnlmuller@gmail.com>
parents: 69
diff changeset
1118 # bottom
f3ce3346e25e Spawn foxes jsut outside the map
Neil Muller <drnlmuller@gmail.com>
parents: 69
diff changeset
1119 y = height
f3ce3346e25e Spawn foxes jsut outside the map
Neil Muller <drnlmuller@gmail.com>
parents: 69
diff changeset
1120 x = random.randint(-1, width)
f3ce3346e25e Spawn foxes jsut outside the map
Neil Muller <drnlmuller@gmail.com>
parents: 69
diff changeset
1121 elif side == 2:
f3ce3346e25e Spawn foxes jsut outside the map
Neil Muller <drnlmuller@gmail.com>
parents: 69
diff changeset
1122 # left
f3ce3346e25e Spawn foxes jsut outside the map
Neil Muller <drnlmuller@gmail.com>
parents: 69
diff changeset
1123 x = -1
f3ce3346e25e Spawn foxes jsut outside the map
Neil Muller <drnlmuller@gmail.com>
parents: 69
diff changeset
1124 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
1125 else:
73
f3ce3346e25e Spawn foxes jsut outside the map
Neil Muller <drnlmuller@gmail.com>
parents: 69
diff changeset
1126 x = width
f3ce3346e25e Spawn foxes jsut outside the map
Neil Muller <drnlmuller@gmail.com>
parents: 69
diff changeset
1127 y = random.randint(-1, height)
403
c7cfa230f5d4 Remove board size restriction on number of foxes
Neil Muller <drnlmuller@gmail.com>
parents: 401
diff changeset
1128 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
1129
67
9171d9b9ab35 Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents: 66
diff changeset
1130 def fix_buildings(self):
9171d9b9ab35 Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents: 66
diff changeset
1131 """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
1132 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
1133
9171d9b9ab35 Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents: 66
diff changeset
1134 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
1135 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
1136 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
1137
9171d9b9ab35 Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents: 66
diff changeset
1138 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
1139 """
9171d9b9ab35 Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents: 66
diff changeset
1140 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
1141
9171d9b9ab35 Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents: 66
diff changeset
1142 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
1143 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
1144 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
1145 tile_pos = (x, y)
9171d9b9ab35 Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents: 66
diff changeset
1146 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
1147 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
1148 continue
9171d9b9ab35 Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents: 66
diff changeset
1149
9171d9b9ab35 Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents: 66
diff changeset
1150 covered = False
9171d9b9ab35 Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents: 66
diff changeset
1151 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
1152 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
1153 covered = True
9171d9b9ab35 Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents: 66
diff changeset
1154 break
9171d9b9ab35 Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents: 66
diff changeset
1155
9171d9b9ab35 Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents: 66
diff changeset
1156 if covered:
9171d9b9ab35 Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents: 66
diff changeset
1157 continue
9171d9b9ab35 Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents: 66
diff changeset
1158
9171d9b9ab35 Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents: 66
diff changeset
1159 building_cls = tile_to_building[tile_no]
557
50d6c68ce267 Add gameboard to buildings. Update save version as this breaks old save games
Neil Muller <drnlmuller@gmail.com>
parents: 556
diff changeset
1160 building = building_cls(tile_pos, self)
50d6c68ce267 Add gameboard to buildings. Update save version as this breaks old save games
Neil Muller <drnlmuller@gmail.com>
parents: 556
diff changeset
1161 building.remove()
50d6c68ce267 Add gameboard to buildings. Update save version as this breaks old save games
Neil Muller <drnlmuller@gmail.com>
parents: 556
diff changeset
1162 building.place()
67
9171d9b9ab35 Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents: 66
diff changeset
1163 self.add_building(building)
139
1d73de63bd71 Add basic game over screen
Neil Muller <drnlmuller@gmail.com>
parents: 135
diff changeset
1164
307
bf1df0902883 three game modes: fortnight, quarter, fox extinction
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 305
diff changeset
1165 def trees_left(self):
bf1df0902883 three game modes: fortnight, quarter, fox extinction
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 305
diff changeset
1166 width, height = self.tv.size
552
11c4cebfe4c5 Preparatory work for woodland biodiversity.
Jeremy Thurgood <firxen@gmail.com>
parents: 548
diff changeset
1167 return len([(x,y) for x in range(width) for y in range(height) if self.is_woodland_tile(misc.Position(x,y))])
307
bf1df0902883 three game modes: fortnight, quarter, fox extinction
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 305
diff changeset
1168
460
7204c16ab64d Wood market!
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 457
diff changeset
1169 def calculate_wood_groat_exchange_rate(self):
461
279caa00f3fa exchange rate should be per tree, not per plank
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 460
diff changeset
1170 # per five planks
460
7204c16ab64d Wood market!
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 457
diff changeset
1171 width, height = self.tv.size
462
aba7f1439571 avoid division by zero
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 461
diff changeset
1172 treesleft = max(1, self.trees_left())
aba7f1439571 avoid division by zero
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 461
diff changeset
1173 sell_price = float(10*width*height)/treesleft
460
7204c16ab64d Wood market!
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 457
diff changeset
1174 buy_price = sell_price*(1.1)
7204c16ab64d Wood market!
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 457
diff changeset
1175 self.wood_sell_price, self.wood_buy_price = int(sell_price), int(buy_price)
7204c16ab64d Wood market!
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 457
diff changeset
1176
496
bf90a2948e34 Basic snapshot support in save games added.
Simon Cross <hodgestar@gmail.com>
parents: 495
diff changeset
1177 def snapshot(self, scale=0.25):
bf90a2948e34 Basic snapshot support in save games added.
Simon Cross <hodgestar@gmail.com>
parents: 495
diff changeset
1178 """Return a snapshot of the gameboard."""
bf90a2948e34 Basic snapshot support in save games added.
Simon Cross <hodgestar@gmail.com>
parents: 495
diff changeset
1179 w, h = self.disp.screen.get_size()
497
a2824eb2474e Only include top widget when creating snapshot.
Simon Cross <hodgestar@gmail.com>
parents: 496
diff changeset
1180 snap_w, snap_h = int(w * scale), int(h * scale)
a2824eb2474e Only include top widget when creating snapshot.
Simon Cross <hodgestar@gmail.com>
parents: 496
diff changeset
1181 dummy_screen = pygame.surface.Surface((w, h), 0, self.disp.screen)
a2824eb2474e Only include top widget when creating snapshot.
Simon Cross <hodgestar@gmail.com>
parents: 496
diff changeset
1182 top_widget = self.get_top_widget()
a2824eb2474e Only include top widget when creating snapshot.
Simon Cross <hodgestar@gmail.com>
parents: 496
diff changeset
1183
a2824eb2474e Only include top widget when creating snapshot.
Simon Cross <hodgestar@gmail.com>
parents: 496
diff changeset
1184 top_widget.paint(dummy_screen)
a2824eb2474e Only include top widget when creating snapshot.
Simon Cross <hodgestar@gmail.com>
parents: 496
diff changeset
1185 snapshot = pygame.transform.smoothscale(dummy_screen, (snap_w, snap_h))
496
bf90a2948e34 Basic snapshot support in save games added.
Simon Cross <hodgestar@gmail.com>
parents: 495
diff changeset
1186 return snapshot
bf90a2948e34 Basic snapshot support in save games added.
Simon Cross <hodgestar@gmail.com>
parents: 495
diff changeset
1187
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
1188 def save_game(self):
463
e3408c803b12 Save and restore tilevid when loading / saving games.
Simon Cross <hodgestar@gmail.com>
parents: 462
diff changeset
1189 # clear selected animals and tool states before saving
e3408c803b12 Save and restore tilevid when loading / saving games.
Simon Cross <hodgestar@gmail.com>
parents: 462
diff changeset
1190 self.reset_states()
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
1191 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
1192
512
b112bcf4d435 Add restore game button to main menu.
Simon Cross <hodgestar@gmail.com>
parents: 506
diff changeset
1193 @staticmethod
b112bcf4d435 Add restore game button to main menu.
Simon Cross <hodgestar@gmail.com>
parents: 506
diff changeset
1194 def restore_game(gameboard):
504
393e30ea0165 Save game loading working again.
Simon Cross <hodgestar@gmail.com>
parents: 500
diff changeset
1195 import engine
512
b112bcf4d435 Add restore game button to main menu.
Simon Cross <hodgestar@gmail.com>
parents: 506
diff changeset
1196 pygame.event.post(pygame.event.Event(engine.DO_LOAD_SAVEGAME, gameboard=gameboard))
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
1197
326
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken.
Simon Cross <hodgestar@gmail.com>
parents: 325
diff changeset
1198
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken.
Simon Cross <hodgestar@gmail.com>
parents: 325
diff changeset
1199 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
1200 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
1201 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
1202
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken.
Simon Cross <hodgestar@gmail.com>
parents: 325
diff changeset
1203 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
1204
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken.
Simon Cross <hodgestar@gmail.com>
parents: 325
diff changeset
1205 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
1206
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken.
Simon Cross <hodgestar@gmail.com>
parents: 325
diff changeset
1207 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
1208 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
1209 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
1210 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
1211 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
1212 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
1213 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
1214
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken.
Simon Cross <hodgestar@gmail.com>
parents: 325
diff changeset
1215 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
1216 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
1217
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken.
Simon Cross <hodgestar@gmail.com>
parents: 325
diff changeset
1218 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
1219 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
1220 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
1221 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
1222 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
1223
89f51d513606 Add TextDialog class and use it to warn about selling your last chicken.
Simon Cross <hodgestar@gmail.com>
parents: 325
diff changeset
1224 gui.Dialog.__init__(self, title_label, tbl, **params)
336
82a18615a0ab Ask 'Are you sure?'
Neil Muller <drnlmuller@gmail.com>
parents: 330
diff changeset
1225
82a18615a0ab Ask 'Are you sure?'
Neil Muller <drnlmuller@gmail.com>
parents: 330
diff changeset
1226