Mercurial > rinkhals
annotate gamelib/gameboard.py @ 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.
author | Simon Cross <hodgestar@gmail.com> |
---|---|
date | Sat, 21 Nov 2009 15:55:32 +0000 |
parents | fbef17cab632 |
children | a356e57529ea |
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 | 3 import pygame |
262
d508248041ff
avoid passing events in twice
Neil Muller <drnlmuller@gmail.com>
parents:
258
diff
changeset
|
4 from pygame.locals import MOUSEBUTTONDOWN, MOUSEMOTION, KEYDOWN, K_UP, K_DOWN, \ |
d508248041ff
avoid passing events in twice
Neil Muller <drnlmuller@gmail.com>
parents:
258
diff
changeset
|
5 K_LEFT, K_RIGHT |
35 | 6 from pgu import gui |
9 | 7 |
24
7584453f4944
Add support for PNG tiles.
Simon Cross <hodgestar@gmail.com>
parents:
17
diff
changeset
|
8 import tiles |
79 | 9 import icons |
40
678421bd58ee
Money counter with very ugly display hack.
Jeremy Thurgood <firxen@gmail.com>
parents:
39
diff
changeset
|
10 import constants |
57
08665fa60345
Implement henhouses and henhouse adding.
Simon Cross <hodgestar@gmail.com>
parents:
54
diff
changeset
|
11 import buildings |
69
18db99fda6bd
Move spawing code from engine to gameboard - seems more natural.
Neil Muller <drnlmuller@gmail.com>
parents:
68
diff
changeset
|
12 import animal |
84 | 13 import equipment |
94 | 14 import sound |
162 | 15 import cursors |
186
f06010d34cd3
Add sprite cursors for building placement.
Simon Cross <hodgestar@gmail.com>
parents:
183
diff
changeset
|
16 import sprite_cursor |
241
1a7000c8211c
Demolition foxes, including better fox selection.
Jeremy Thurgood <firxen@gmail.com>
parents:
239
diff
changeset
|
17 import misc |
320
9bf0e701a36e
Switch between 'Finished Day' and 'Fast Forward' modes
Neil Muller <drnlmuller@gmail.com>
parents:
316
diff
changeset
|
18 import engine |
35 | 19 |
40
678421bd58ee
Money counter with very ugly display hack.
Jeremy Thurgood <firxen@gmail.com>
parents:
39
diff
changeset
|
20 class OpaqueLabel(gui.Label): |
168 | 21 def __init__(self, value, **params): |
22 gui.Label.__init__(self, value, **params) | |
23 if 'width' in params: | |
24 self._width = params['width'] | |
25 if 'height' in params: | |
26 self._height = params['height'] | |
27 self._set_size() | |
28 | |
29 def _set_size(self): | |
30 width, height = self.font.size(self.value) | |
31 width = getattr(self, '_width', width) | |
32 height = getattr(self, '_height', height) | |
33 self.style.width, self.style.height = width, height | |
34 | |
40
678421bd58ee
Money counter with very ugly display hack.
Jeremy Thurgood <firxen@gmail.com>
parents:
39
diff
changeset
|
35 def paint(self, s): |
678421bd58ee
Money counter with very ugly display hack.
Jeremy Thurgood <firxen@gmail.com>
parents:
39
diff
changeset
|
36 s.fill(self.style.background) |
168 | 37 if self.style.align > 0: |
38 r = s.get_rect() | |
39 w, _ = self.font.size(self.value) | |
40 s = s.subsurface(r.move((r.w-w, 0)).clip(r)) | |
40
678421bd58ee
Money counter with very ugly display hack.
Jeremy Thurgood <firxen@gmail.com>
parents:
39
diff
changeset
|
41 gui.Label.paint(self, s) |
678421bd58ee
Money counter with very ugly display hack.
Jeremy Thurgood <firxen@gmail.com>
parents:
39
diff
changeset
|
42 |
678421bd58ee
Money counter with very ugly display hack.
Jeremy Thurgood <firxen@gmail.com>
parents:
39
diff
changeset
|
43 def update_value(self, value): |
678421bd58ee
Money counter with very ugly display hack.
Jeremy Thurgood <firxen@gmail.com>
parents:
39
diff
changeset
|
44 self.value = value |
168 | 45 self._set_size() |
40
678421bd58ee
Money counter with very ugly display hack.
Jeremy Thurgood <firxen@gmail.com>
parents:
39
diff
changeset
|
46 self.repaint() |
678421bd58ee
Money counter with very ugly display hack.
Jeremy Thurgood <firxen@gmail.com>
parents:
39
diff
changeset
|
47 |
168 | 48 def mklabel(text="", **params): |
49 params.setdefault('color', constants.FG_COLOR) | |
50 params.setdefault('width', GameBoard.TOOLBAR_WIDTH/2) | |
51 return OpaqueLabel(text, **params) | |
109
48019afde338
Equipment purchasing and some toolbar tweaks.
Jeremy Thurgood <firxen@gmail.com>
parents:
108
diff
changeset
|
52 |
48019afde338
Equipment purchasing and some toolbar tweaks.
Jeremy Thurgood <firxen@gmail.com>
parents:
108
diff
changeset
|
53 def mkcountupdate(counter): |
48019afde338
Equipment purchasing and some toolbar tweaks.
Jeremy Thurgood <firxen@gmail.com>
parents:
108
diff
changeset
|
54 def update_counter(self, value): |
168 | 55 getattr(self, counter).update_value("%s " % value) |
109
48019afde338
Equipment purchasing and some toolbar tweaks.
Jeremy Thurgood <firxen@gmail.com>
parents:
108
diff
changeset
|
56 self.repaint() |
48019afde338
Equipment purchasing and some toolbar tweaks.
Jeremy Thurgood <firxen@gmail.com>
parents:
108
diff
changeset
|
57 return update_counter |
40
678421bd58ee
Money counter with very ugly display hack.
Jeremy Thurgood <firxen@gmail.com>
parents:
39
diff
changeset
|
58 |
35 | 59 class ToolBar(gui.Table): |
389
463802281182
Add basic level support (level choosing needs work)
Neil Muller <drnlmuller@gmail.com>
parents:
382
diff
changeset
|
60 def __init__(self, gameboard, level, **params): |
35 | 61 gui.Table.__init__(self, **params) |
245
634491bf37e8
Change toolbar to gui.Toolbar -- gives nicer highlighting.
Simon Cross <hodgestar@gmail.com>
parents:
243
diff
changeset
|
62 self.group = gui.Group(name='toolbar', value=None) |
634491bf37e8
Change toolbar to gui.Toolbar -- gives nicer highlighting.
Simon Cross <hodgestar@gmail.com>
parents:
243
diff
changeset
|
63 self._next_tool_value = 0 |
35 | 64 self.gameboard = gameboard |
168 | 65 self.cash_counter = mklabel(align=1) |
422
ab4fc3fe0f96
chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
421
diff
changeset
|
66 self.wood_counter = mklabel(align=1) |
168 | 67 self.chicken_counter = mklabel(align=1) |
68 self.egg_counter = mklabel(align=1) | |
69 self.day_counter = mklabel(align=1) | |
70 self.killed_foxes = mklabel(align=1) | |
83
9bd2c22e1746
Cleaned up some toolbar code a bit.
Jeremy Thurgood <firxen@gmail.com>
parents:
80
diff
changeset
|
71 |
168 | 72 self.tr() |
73 self.td(gui.Spacer(self.rect.w/2, 0)) | |
74 self.td(gui.Spacer(self.rect.w/2, 0)) | |
139
1d73de63bd71
Add basic game over screen
Neil Muller <drnlmuller@gmail.com>
parents:
135
diff
changeset
|
75 self.add_counter(mklabel("Day:"), self.day_counter) |
109
48019afde338
Equipment purchasing and some toolbar tweaks.
Jeremy Thurgood <firxen@gmail.com>
parents:
108
diff
changeset
|
76 self.add_counter(mklabel("Groats:"), self.cash_counter) |
422
ab4fc3fe0f96
chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
421
diff
changeset
|
77 self.add_counter(mklabel("Planks:"), self.wood_counter) |
116
d539ef5a3333
Add basic chicken->egg cycle
Neil Muller <drnlmuller@gmail.com>
parents:
115
diff
changeset
|
78 self.add_counter(mklabel("Eggs:"), self.egg_counter) |
83
9bd2c22e1746
Cleaned up some toolbar code a bit.
Jeremy Thurgood <firxen@gmail.com>
parents:
80
diff
changeset
|
79 self.add_counter(icons.CHKN_ICON, self.chicken_counter) |
9bd2c22e1746
Cleaned up some toolbar code a bit.
Jeremy Thurgood <firxen@gmail.com>
parents:
80
diff
changeset
|
80 self.add_counter(icons.KILLED_FOX, self.killed_foxes) |
378
71f5897ac5ef
Fences are now buildings, with appropriate (but ugly) UI changes.
Jeremy Thurgood <firxen@gmail.com>
parents:
361
diff
changeset
|
81 self.add_spacer(5) |
154 | 82 |
162 | 83 self.add_tool_button("Move Hen", constants.TOOL_PLACE_ANIMALS, |
270
31f5033eac70
Add prices to all tools where is makes sense to do so.
Simon Cross <hodgestar@gmail.com>
parents:
264
diff
changeset
|
84 None, cursors.cursors['select']) |
378
71f5897ac5ef
Fences are now buildings, with appropriate (but ugly) UI changes.
Jeremy Thurgood <firxen@gmail.com>
parents:
361
diff
changeset
|
85 self.add_spacer(5) |
83
9bd2c22e1746
Cleaned up some toolbar code a bit.
Jeremy Thurgood <firxen@gmail.com>
parents:
80
diff
changeset
|
86 |
154 | 87 self.add_heading("Sell ...") |
162 | 88 self.add_tool_button("Chicken", constants.TOOL_SELL_CHICKEN, |
389
463802281182
Add basic level support (level choosing needs work)
Neil Muller <drnlmuller@gmail.com>
parents:
382
diff
changeset
|
89 level.sell_price_chicken, cursors.cursors['sell']) |
162 | 90 self.add_tool_button("Egg", constants.TOOL_SELL_EGG, |
389
463802281182
Add basic level support (level choosing needs work)
Neil Muller <drnlmuller@gmail.com>
parents:
382
diff
changeset
|
91 level.sell_price_egg, cursors.cursors['sell']) |
162 | 92 self.add_tool_button("Building", constants.TOOL_SELL_BUILDING, |
270
31f5033eac70
Add prices to all tools where is makes sense to do so.
Simon Cross <hodgestar@gmail.com>
parents:
264
diff
changeset
|
93 None, cursors.cursors['sell']) |
252
e12b39132ffb
Make sell equipment use the select cursor for consistency with the other sell tools.
Simon Cross <hodgestar@gmail.com>
parents:
251
diff
changeset
|
94 self.add_tool_button("Equipment", constants.TOOL_SELL_EQUIPMENT, |
270
31f5033eac70
Add prices to all tools where is makes sense to do so.
Simon Cross <hodgestar@gmail.com>
parents:
264
diff
changeset
|
95 None, cursors.cursors['sell']) |
378
71f5897ac5ef
Fences are now buildings, with appropriate (but ugly) UI changes.
Jeremy Thurgood <firxen@gmail.com>
parents:
361
diff
changeset
|
96 self.add_spacer(5) |
154 | 97 |
98 self.add_heading("Buy ...") | |
270
31f5033eac70
Add prices to all tools where is makes sense to do so.
Simon Cross <hodgestar@gmail.com>
parents:
264
diff
changeset
|
99 |
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
|
100 for building_cls in buildings.BUILDINGS: |
162 | 101 self.add_tool_button(building_cls.NAME.title(), building_cls, |
270
31f5033eac70
Add prices to all tools where is makes sense to do so.
Simon Cross <hodgestar@gmail.com>
parents:
264
diff
changeset
|
102 None, cursors.cursors.get('build', None)) |
31f5033eac70
Add prices to all tools where is makes sense to do so.
Simon Cross <hodgestar@gmail.com>
parents:
264
diff
changeset
|
103 |
109
48019afde338
Equipment purchasing and some toolbar tweaks.
Jeremy Thurgood <firxen@gmail.com>
parents:
108
diff
changeset
|
104 for equipment_cls in equipment.EQUIPMENT: |
270
31f5033eac70
Add prices to all tools where is makes sense to do so.
Simon Cross <hodgestar@gmail.com>
parents:
264
diff
changeset
|
105 self.add_tool_button(equipment_cls.NAME.title(), |
31f5033eac70
Add prices to all tools where is makes sense to do so.
Simon Cross <hodgestar@gmail.com>
parents:
264
diff
changeset
|
106 equipment_cls, |
31f5033eac70
Add prices to all tools where is makes sense to do so.
Simon Cross <hodgestar@gmail.com>
parents:
264
diff
changeset
|
107 equipment_cls.BUY_PRICE, |
247
5b9cd693fe7c
Add sprite cursors for equipment buying.
Simon Cross <hodgestar@gmail.com>
parents:
245
diff
changeset
|
108 cursors.cursors.get('buy', None)) |
270
31f5033eac70
Add prices to all tools where is makes sense to do so.
Simon Cross <hodgestar@gmail.com>
parents:
264
diff
changeset
|
109 |
378
71f5897ac5ef
Fences are now buildings, with appropriate (but ugly) UI changes.
Jeremy Thurgood <firxen@gmail.com>
parents:
361
diff
changeset
|
110 self.add_spacer(5) |
71f5897ac5ef
Fences are now buildings, with appropriate (but ugly) UI changes.
Jeremy Thurgood <firxen@gmail.com>
parents:
361
diff
changeset
|
111 self.add_tool_button("Repair", constants.TOOL_REPAIR_BUILDING, None, cursors.cursors['repair']) |
71f5897ac5ef
Fences are now buildings, with appropriate (but ugly) UI changes.
Jeremy Thurgood <firxen@gmail.com>
parents:
361
diff
changeset
|
112 |
71f5897ac5ef
Fences are now buildings, with appropriate (but ugly) UI changes.
Jeremy Thurgood <firxen@gmail.com>
parents:
361
diff
changeset
|
113 self.add_spacer(5) |
286
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
114 self.add_tool("Price Reference", self.show_prices) |
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
|
115 |
320
9bf0e701a36e
Switch between 'Finished Day' and 'Fast Forward' modes
Neil Muller <drnlmuller@gmail.com>
parents:
316
diff
changeset
|
116 self.fin_tool = self.add_tool("Finished Day", self.day_done) |
68
6b8ac424da83
Add button for finishing day. Remove debugging print.
Simon Cross <hodgestar@gmail.com>
parents:
67
diff
changeset
|
117 |
292
bf271e857157
Clear tool when calling price dialog
Neil Muller <drnlmuller@gmail.com>
parents:
290
diff
changeset
|
118 self.anim_clear_tool = False # Flag to clear the tool on an anim loop |
294 | 119 # pgu's tool widget fiddling happens after the tool action, so calling |
120 # clear_tool in the tool's action doesn't work, so we punt it to | |
121 # the anim loop | |
292
bf271e857157
Clear tool when calling price dialog
Neil Muller <drnlmuller@gmail.com>
parents:
290
diff
changeset
|
122 |
68
6b8ac424da83
Add button for finishing day. Remove debugging print.
Simon Cross <hodgestar@gmail.com>
parents:
67
diff
changeset
|
123 def day_done(self): |
320
9bf0e701a36e
Switch between 'Finished Day' and 'Fast Forward' modes
Neil Muller <drnlmuller@gmail.com>
parents:
316
diff
changeset
|
124 if self.gameboard.day: |
9bf0e701a36e
Switch between 'Finished Day' and 'Fast Forward' modes
Neil Muller <drnlmuller@gmail.com>
parents:
316
diff
changeset
|
125 pygame.event.post(engine.START_NIGHT) |
9bf0e701a36e
Switch between 'Finished Day' and 'Fast Forward' modes
Neil Muller <drnlmuller@gmail.com>
parents:
316
diff
changeset
|
126 else: |
9bf0e701a36e
Switch between 'Finished Day' and 'Fast Forward' modes
Neil Muller <drnlmuller@gmail.com>
parents:
316
diff
changeset
|
127 self.anim_clear_tool = True |
9bf0e701a36e
Switch between 'Finished Day' and 'Fast Forward' modes
Neil Muller <drnlmuller@gmail.com>
parents:
316
diff
changeset
|
128 pygame.event.post(engine.FAST_FORWARD) |
9bf0e701a36e
Switch between 'Finished Day' and 'Fast Forward' modes
Neil Muller <drnlmuller@gmail.com>
parents:
316
diff
changeset
|
129 |
9bf0e701a36e
Switch between 'Finished Day' and 'Fast Forward' modes
Neil Muller <drnlmuller@gmail.com>
parents:
316
diff
changeset
|
130 def update_fin_tool(self, day): |
9bf0e701a36e
Switch between 'Finished Day' and 'Fast Forward' modes
Neil Muller <drnlmuller@gmail.com>
parents:
316
diff
changeset
|
131 if day: |
9bf0e701a36e
Switch between 'Finished Day' and 'Fast Forward' modes
Neil Muller <drnlmuller@gmail.com>
parents:
316
diff
changeset
|
132 self.fin_tool.widget = gui.basic.Label('Finished Day') |
9bf0e701a36e
Switch between 'Finished Day' and 'Fast Forward' modes
Neil Muller <drnlmuller@gmail.com>
parents:
316
diff
changeset
|
133 self.fin_tool.resize() |
9bf0e701a36e
Switch between 'Finished Day' and 'Fast Forward' modes
Neil Muller <drnlmuller@gmail.com>
parents:
316
diff
changeset
|
134 else: |
9bf0e701a36e
Switch between 'Finished Day' and 'Fast Forward' modes
Neil Muller <drnlmuller@gmail.com>
parents:
316
diff
changeset
|
135 self.fin_tool.widget = gui.basic.Label('Fast Forward') |
9bf0e701a36e
Switch between 'Finished Day' and 'Fast Forward' modes
Neil Muller <drnlmuller@gmail.com>
parents:
316
diff
changeset
|
136 self.fin_tool.resize() |
68
6b8ac424da83
Add button for finishing day. Remove debugging print.
Simon Cross <hodgestar@gmail.com>
parents:
67
diff
changeset
|
137 |
286
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
138 def show_prices(self): |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
139 """Popup dialog of prices""" |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
140 def make_box(text): |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
141 style = { |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
142 'border' : 1 |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
143 } |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
144 word = gui.Label(text, style=style) |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
145 return word |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
146 |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
147 def fix_widths(doc): |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
148 """Loop through all the widgets in the doc, and set the |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
149 width of the labels to max + 10""" |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
150 # We need to do this because of possible font issues |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
151 max_width = 0 |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
152 for thing in doc.widgets: |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
153 if hasattr(thing, 'style'): |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
154 # A label |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
155 if thing.style.width > max_width: |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
156 max_width = thing.style.width |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
157 for thing in doc.widgets: |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
158 if hasattr(thing, 'style'): |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
159 thing.style.width = max_width + 10 |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
160 |
287
21b0c4a99c0a
Add close button to price dialog
Neil Muller <drnlmuller@gmail.com>
parents:
286
diff
changeset
|
161 tbl = gui.Table() |
21b0c4a99c0a
Add close button to price dialog
Neil Muller <drnlmuller@gmail.com>
parents:
286
diff
changeset
|
162 tbl.tr() |
378
71f5897ac5ef
Fences are now buildings, with appropriate (but ugly) UI changes.
Jeremy Thurgood <firxen@gmail.com>
parents:
361
diff
changeset
|
163 doc = gui.Document(width=510) |
286
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
164 space = doc.style.font.size(" ") |
378
71f5897ac5ef
Fences are now buildings, with appropriate (but ugly) UI changes.
Jeremy Thurgood <firxen@gmail.com>
parents:
361
diff
changeset
|
165 for header in ['Item', 'Buy Price', 'Sell Price', 'Repair Price']: |
286
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
166 doc.add(make_box(header)) |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
167 doc.br(space[1]) |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
168 for building in buildings.BUILDINGS: |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
169 doc.add(make_box(building.NAME)) |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
170 doc.add(make_box('%d' % building.BUY_PRICE)) |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
171 doc.add(make_box('%d' % building.SELL_PRICE)) |
378
71f5897ac5ef
Fences are now buildings, with appropriate (but ugly) UI changes.
Jeremy Thurgood <firxen@gmail.com>
parents:
361
diff
changeset
|
172 if building.BREAKABLE: |
71f5897ac5ef
Fences are now buildings, with appropriate (but ugly) UI changes.
Jeremy Thurgood <firxen@gmail.com>
parents:
361
diff
changeset
|
173 doc.add(make_box('%d' % building.REPAIR_PRICE)) |
71f5897ac5ef
Fences are now buildings, with appropriate (but ugly) UI changes.
Jeremy Thurgood <firxen@gmail.com>
parents:
361
diff
changeset
|
174 else: |
71f5897ac5ef
Fences are now buildings, with appropriate (but ugly) UI changes.
Jeremy Thurgood <firxen@gmail.com>
parents:
361
diff
changeset
|
175 doc.add(make_box('N/A')) |
286
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
176 doc.br(space[1]) |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
177 for equip in equipment.EQUIPMENT: |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
178 doc.add(make_box(equip.NAME)) |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
179 doc.add(make_box('%d' % equip.BUY_PRICE)) |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
180 doc.add(make_box('%d' % equip.SELL_PRICE)) |
378
71f5897ac5ef
Fences are now buildings, with appropriate (but ugly) UI changes.
Jeremy Thurgood <firxen@gmail.com>
parents:
361
diff
changeset
|
181 doc.add(make_box('N/A')) |
286
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
182 doc.br(space[1]) |
348
e61f95503461
Add fences to price list. Tidying up price list dialog a little.
Simon Cross <hodgestar@gmail.com>
parents:
346
diff
changeset
|
183 |
286
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
184 fix_widths(doc) |
378
71f5897ac5ef
Fences are now buildings, with appropriate (but ugly) UI changes.
Jeremy Thurgood <firxen@gmail.com>
parents:
361
diff
changeset
|
185 for word in "Damaged equipment or buildings will be sold for" \ |
348
e61f95503461
Add fences to price list. Tidying up price list dialog a little.
Simon Cross <hodgestar@gmail.com>
parents:
346
diff
changeset
|
186 " less than the sell price.".split(): |
286
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
187 doc.add(gui.Label(word)) |
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
188 doc.space(space) |
287
21b0c4a99c0a
Add close button to price dialog
Neil Muller <drnlmuller@gmail.com>
parents:
286
diff
changeset
|
189 close_button = gui.Button("Close") |
348
e61f95503461
Add fences to price list. Tidying up price list dialog a little.
Simon Cross <hodgestar@gmail.com>
parents:
346
diff
changeset
|
190 tbl.td(doc) |
287
21b0c4a99c0a
Add close button to price dialog
Neil Muller <drnlmuller@gmail.com>
parents:
286
diff
changeset
|
191 tbl.tr() |
348
e61f95503461
Add fences to price list. Tidying up price list dialog a little.
Simon Cross <hodgestar@gmail.com>
parents:
346
diff
changeset
|
192 tbl.td(close_button, align=1) |
287
21b0c4a99c0a
Add close button to price dialog
Neil Muller <drnlmuller@gmail.com>
parents:
286
diff
changeset
|
193 dialog = gui.Dialog(gui.Label('Price Reference'), tbl) |
21b0c4a99c0a
Add close button to price dialog
Neil Muller <drnlmuller@gmail.com>
parents:
286
diff
changeset
|
194 close_button.connect(gui.CLICK, dialog.close) |
286
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
195 dialog.open() |
292
bf271e857157
Clear tool when calling price dialog
Neil Muller <drnlmuller@gmail.com>
parents:
290
diff
changeset
|
196 self.anim_clear_tool = True |
286
49418fd43748
Price reference dialog - without close button
Neil Muller <drnlmuller@gmail.com>
parents:
278
diff
changeset
|
197 |
109
48019afde338
Equipment purchasing and some toolbar tweaks.
Jeremy Thurgood <firxen@gmail.com>
parents:
108
diff
changeset
|
198 update_cash_counter = mkcountupdate('cash_counter') |
422
ab4fc3fe0f96
chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
421
diff
changeset
|
199 update_wood_counter = mkcountupdate('wood_counter') |
109
48019afde338
Equipment purchasing and some toolbar tweaks.
Jeremy Thurgood <firxen@gmail.com>
parents:
108
diff
changeset
|
200 update_fox_counter = mkcountupdate('killed_foxes') |
48019afde338
Equipment purchasing and some toolbar tweaks.
Jeremy Thurgood <firxen@gmail.com>
parents:
108
diff
changeset
|
201 update_chicken_counter = mkcountupdate('chicken_counter') |
116
d539ef5a3333
Add basic chicken->egg cycle
Neil Muller <drnlmuller@gmail.com>
parents:
115
diff
changeset
|
202 update_egg_counter = mkcountupdate('egg_counter') |
139
1d73de63bd71
Add basic game over screen
Neil Muller <drnlmuller@gmail.com>
parents:
135
diff
changeset
|
203 update_day_counter = mkcountupdate('day_counter') |
79 | 204 |
168 | 205 def add_spacer(self, height): |
83
9bd2c22e1746
Cleaned up some toolbar code a bit.
Jeremy Thurgood <firxen@gmail.com>
parents:
80
diff
changeset
|
206 self.tr() |
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
|
207 self.td(gui.Spacer(0, height), colspan=2) |
83
9bd2c22e1746
Cleaned up some toolbar code a bit.
Jeremy Thurgood <firxen@gmail.com>
parents:
80
diff
changeset
|
208 |
154 | 209 def add_heading(self, text): |
210 self.tr() | |
211 self.td(mklabel(text), colspan=2) | |
212 | |
270
31f5033eac70
Add prices to all tools where is makes sense to do so.
Simon Cross <hodgestar@gmail.com>
parents:
264
diff
changeset
|
213 def add_tool_button(self, text, tool, price=None, cursor=None): |
31f5033eac70
Add prices to all tools where is makes sense to do so.
Simon Cross <hodgestar@gmail.com>
parents:
264
diff
changeset
|
214 if price is not None: |
31f5033eac70
Add prices to all tools where is makes sense to do so.
Simon Cross <hodgestar@gmail.com>
parents:
264
diff
changeset
|
215 text = "%s (%s)" % (text, price) |
245
634491bf37e8
Change toolbar to gui.Toolbar -- gives nicer highlighting.
Simon Cross <hodgestar@gmail.com>
parents:
243
diff
changeset
|
216 self.add_tool(text, lambda: self.gameboard.set_selected_tool(tool, |
162 | 217 cursor)) |
83
9bd2c22e1746
Cleaned up some toolbar code a bit.
Jeremy Thurgood <firxen@gmail.com>
parents:
80
diff
changeset
|
218 |
245
634491bf37e8
Change toolbar to gui.Toolbar -- gives nicer highlighting.
Simon Cross <hodgestar@gmail.com>
parents:
243
diff
changeset
|
219 def add_tool(self, text, func): |
634491bf37e8
Change toolbar to gui.Toolbar -- gives nicer highlighting.
Simon Cross <hodgestar@gmail.com>
parents:
243
diff
changeset
|
220 label = gui.basic.Label(text) |
634491bf37e8
Change toolbar to gui.Toolbar -- gives nicer highlighting.
Simon Cross <hodgestar@gmail.com>
parents:
243
diff
changeset
|
221 value = self._next_tool_value |
634491bf37e8
Change toolbar to gui.Toolbar -- gives nicer highlighting.
Simon Cross <hodgestar@gmail.com>
parents:
243
diff
changeset
|
222 self._next_tool_value += 1 |
634491bf37e8
Change toolbar to gui.Toolbar -- gives nicer highlighting.
Simon Cross <hodgestar@gmail.com>
parents:
243
diff
changeset
|
223 tool = gui.Tool(self.group, label, value, width=self.rect.w, style={"padding_left": 0}) |
634491bf37e8
Change toolbar to gui.Toolbar -- gives nicer highlighting.
Simon Cross <hodgestar@gmail.com>
parents:
243
diff
changeset
|
224 tool.connect(gui.CLICK, func) |
35 | 225 self.tr() |
245
634491bf37e8
Change toolbar to gui.Toolbar -- gives nicer highlighting.
Simon Cross <hodgestar@gmail.com>
parents:
243
diff
changeset
|
226 self.td(tool, align=-1, colspan=2) |
320
9bf0e701a36e
Switch between 'Finished Day' and 'Fast Forward' modes
Neil Muller <drnlmuller@gmail.com>
parents:
316
diff
changeset
|
227 return tool |
245
634491bf37e8
Change toolbar to gui.Toolbar -- gives nicer highlighting.
Simon Cross <hodgestar@gmail.com>
parents:
243
diff
changeset
|
228 |
634491bf37e8
Change toolbar to gui.Toolbar -- gives nicer highlighting.
Simon Cross <hodgestar@gmail.com>
parents:
243
diff
changeset
|
229 def clear_tool(self): |
634491bf37e8
Change toolbar to gui.Toolbar -- gives nicer highlighting.
Simon Cross <hodgestar@gmail.com>
parents:
243
diff
changeset
|
230 self.group.value = None |
288
5539744cfd40
Clear tool selection status when cancelling a tool
Neil Muller <drnlmuller@gmail.com>
parents:
287
diff
changeset
|
231 for item in self.group.widgets: |
5539744cfd40
Clear tool selection status when cancelling a tool
Neil Muller <drnlmuller@gmail.com>
parents:
287
diff
changeset
|
232 item.pcls = "" |
292
bf271e857157
Clear tool when calling price dialog
Neil Muller <drnlmuller@gmail.com>
parents:
290
diff
changeset
|
233 self.anim_clear_tool = False |
35 | 234 |
83
9bd2c22e1746
Cleaned up some toolbar code a bit.
Jeremy Thurgood <firxen@gmail.com>
parents:
80
diff
changeset
|
235 def add_counter(self, icon, label): |
9bd2c22e1746
Cleaned up some toolbar code a bit.
Jeremy Thurgood <firxen@gmail.com>
parents:
80
diff
changeset
|
236 self.tr() |
168 | 237 self.td(icon, width=self.rect.w/2) |
238 self.td(label, width=self.rect.w/2) | |
35 | 239 |
152
702bc0eb2ac3
Fix Toolbar width to TOOLBAR_WIDTH by not allowing it to resize.
Simon Cross <hodgestar@gmail.com>
parents:
151
diff
changeset
|
240 def resize(self, width=None, height=None): |
702bc0eb2ac3
Fix Toolbar width to TOOLBAR_WIDTH by not allowing it to resize.
Simon Cross <hodgestar@gmail.com>
parents:
151
diff
changeset
|
241 width, height = gui.Table.resize(self, width, height) |
702bc0eb2ac3
Fix Toolbar width to TOOLBAR_WIDTH by not allowing it to resize.
Simon Cross <hodgestar@gmail.com>
parents:
151
diff
changeset
|
242 width = GameBoard.TOOLBAR_WIDTH |
702bc0eb2ac3
Fix Toolbar width to TOOLBAR_WIDTH by not allowing it to resize.
Simon Cross <hodgestar@gmail.com>
parents:
151
diff
changeset
|
243 return width, height |
702bc0eb2ac3
Fix Toolbar width to TOOLBAR_WIDTH by not allowing it to resize.
Simon Cross <hodgestar@gmail.com>
parents:
151
diff
changeset
|
244 |
702bc0eb2ac3
Fix Toolbar width to TOOLBAR_WIDTH by not allowing it to resize.
Simon Cross <hodgestar@gmail.com>
parents:
151
diff
changeset
|
245 |
35 | 246 class VidWidget(gui.Widget): |
247 def __init__(self, gameboard, vid, **params): | |
248 gui.Widget.__init__(self, **params) | |
249 self.gameboard = gameboard | |
250 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
|
251 self.vid.bounds = pygame.Rect((0, 0), vid.tile_to_view(vid.size)) |
35 | 252 |
253 def paint(self, surface): | |
254 self.vid.paint(surface) | |
255 | |
256 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
|
257 return self.vid.update(surface) |
35 | 258 |
39
ec79aabe2bf1
Scroll game window with arrow keys.
Jeremy Thurgood <firxen@gmail.com>
parents:
37
diff
changeset
|
259 def move_view(self, x, y): |
ec79aabe2bf1
Scroll game window with arrow keys.
Jeremy Thurgood <firxen@gmail.com>
parents:
37
diff
changeset
|
260 self.vid.view.move_ip((x, y)) |
ec79aabe2bf1
Scroll game window with arrow keys.
Jeremy Thurgood <firxen@gmail.com>
parents:
37
diff
changeset
|
261 |
35 | 262 def event(self, e): |
263 if e.type == MOUSEBUTTONDOWN: | |
264 self.gameboard.use_tool(e) | |
186
f06010d34cd3
Add sprite cursors for building placement.
Simon Cross <hodgestar@gmail.com>
parents:
183
diff
changeset
|
265 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
|
266 self.gameboard.update_sprite_cursor(e) |
35 | 267 |
9 | 268 class GameBoard(object): |
269 TILE_DIMENSIONS = (20, 20) | |
35 | 270 TOOLBAR_WIDTH = 140 |
9 | 271 |
66
edc15ce8fa30
Implement fence selling (a bit hackish, but fine for now).
Simon Cross <hodgestar@gmail.com>
parents:
65
diff
changeset
|
272 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
|
273 FENCE = tiles.REVERSE_TILE_MAP['fence'] |
79 | 274 WOODLAND = tiles.REVERSE_TILE_MAP['woodland'] |
69
18db99fda6bd
Move spawing code from engine to gameboard - seems more natural.
Neil Muller <drnlmuller@gmail.com>
parents:
68
diff
changeset
|
275 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
|
276 |
389
463802281182
Add basic level support (level choosing needs work)
Neil Muller <drnlmuller@gmail.com>
parents:
382
diff
changeset
|
277 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
|
278 self.disp = main_app |
389
463802281182
Add basic level support (level choosing needs work)
Neil Muller <drnlmuller@gmail.com>
parents:
382
diff
changeset
|
279 self.level = level |
24
7584453f4944
Add support for PNG tiles.
Simon Cross <hodgestar@gmail.com>
parents:
17
diff
changeset
|
280 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
|
281 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
|
282 self.tv.tga_load_level(level.map) |
382
e89e6ad011ac
Use code layer to place chickens
Neil Muller <drnlmuller@gmail.com>
parents:
381
diff
changeset
|
283 width, height = self.tv.size |
323
978efd39a099
Limit maximum numbe of foxes generated
Neil Muller <drnlmuller@gmail.com>
parents:
320
diff
changeset
|
284 # 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
|
285 self.max_foxes = level.max_foxes |
40
678421bd58ee
Money counter with very ugly display hack.
Jeremy Thurgood <firxen@gmail.com>
parents:
39
diff
changeset
|
286 |
35 | 287 self.selected_tool = None |
105
7910b4e01dba
Add chicken moving tool and start of animal placement.
Simon Cross <hodgestar@gmail.com>
parents:
98
diff
changeset
|
288 self.animal_to_place = None |
186
f06010d34cd3
Add sprite cursors for building placement.
Simon Cross <hodgestar@gmail.com>
parents:
183
diff
changeset
|
289 self.sprite_cursor = None |
116
d539ef5a3333
Add basic chicken->egg cycle
Neil Muller <drnlmuller@gmail.com>
parents:
115
diff
changeset
|
290 self.chickens = set() |
d539ef5a3333
Add basic chicken->egg cycle
Neil Muller <drnlmuller@gmail.com>
parents:
115
diff
changeset
|
291 self.foxes = set() |
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
|
292 self.buildings = [] |
401
7405f7db469f
Tweak fox attack logic - we no longer ignore chickens we accidently step on
Neil Muller <drnlmuller@gmail.com>
parents:
400
diff
changeset
|
293 self._pos_cache = { 'fox' : [], 'chicken' : []} |
40
678421bd58ee
Money counter with very ugly display hack.
Jeremy Thurgood <firxen@gmail.com>
parents:
39
diff
changeset
|
294 self.cash = 0 |
422
ab4fc3fe0f96
chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
421
diff
changeset
|
295 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
|
296 self.eggs = 0 |
139
1d73de63bd71
Add basic game over screen
Neil Muller <drnlmuller@gmail.com>
parents:
135
diff
changeset
|
297 self.days = 0 |
79 | 298 self.killed_foxes = 0 |
223 | 299 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
|
300 # For the level loading case |
fbef17cab632
Use fully rendered map in gameboard choosing screen
Neil Muller <drnlmuller@gmail.com>
parents:
422
diff
changeset
|
301 if self.disp: |
fbef17cab632
Use fully rendered map in gameboard choosing screen
Neil Muller <drnlmuller@gmail.com>
parents:
422
diff
changeset
|
302 self.create_display() |
fbef17cab632
Use fully rendered map in gameboard choosing screen
Neil Muller <drnlmuller@gmail.com>
parents:
422
diff
changeset
|
303 self.add_cash(level.starting_cash) |
17
cbbc5da7708a
Interaction with the game board.
Jeremy Thurgood <firxen@gmail.com>
parents:
14
diff
changeset
|
304 |
67
9171d9b9ab35
Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents:
66
diff
changeset
|
305 self.fix_buildings() |
9171d9b9ab35
Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents:
66
diff
changeset
|
306 |
408
02a6de5629d6
Levels can include starting equipment
Neil Muller <drnlmuller@gmail.com>
parents:
405
diff
changeset
|
307 cdata = {} |
02a6de5629d6
Levels can include starting equipment
Neil Muller <drnlmuller@gmail.com>
parents:
405
diff
changeset
|
308 for tn in equipment.EQUIP_MAP: |
02a6de5629d6
Levels can include starting equipment
Neil Muller <drnlmuller@gmail.com>
parents:
405
diff
changeset
|
309 cdata[tn] = (self.add_start_chickens, tn) |
382
e89e6ad011ac
Use code layer to place chickens
Neil Muller <drnlmuller@gmail.com>
parents:
381
diff
changeset
|
310 |
e89e6ad011ac
Use code layer to place chickens
Neil Muller <drnlmuller@gmail.com>
parents:
381
diff
changeset
|
311 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
|
312 |
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
|
313 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
|
314 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
|
315 |
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
|
316 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
|
317 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
|
318 tbl = gui.Table() |
5569430fd82e
Display cleanup and rationalisation.
Jeremy Thurgood <firxen@gmail.com>
parents:
35
diff
changeset
|
319 tbl.tr() |
389
463802281182
Add basic level support (level choosing needs work)
Neil Muller <drnlmuller@gmail.com>
parents:
382
diff
changeset
|
320 self.toolbar = ToolBar(self, self.level, width=self.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
|
321 tbl.td(self.toolbar, valign=-1) |
152
702bc0eb2ac3
Fix Toolbar width to TOOLBAR_WIDTH by not allowing it to resize.
Simon Cross <hodgestar@gmail.com>
parents:
151
diff
changeset
|
322 self.tvw = VidWidget(self, self.tv, width=width-self.TOOLBAR_WIDTH, height=height) |
37
497b53b69280
Always update the vidwidget.
Jeremy Thurgood <firxen@gmail.com>
parents:
36
diff
changeset
|
323 tbl.td(self.tvw) |
151
082868bea873
Refactor UI so that only a single gui.App is used. Pass all UI events via main_app. Change Toolbar table to use .td() everywhere. Move toolbar to top.
Simon Cross <hodgestar@gmail.com>
parents:
148
diff
changeset
|
324 self.top_widget = tbl |
14 | 325 |
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
|
326 def update(self): |
37
497b53b69280
Always update the vidwidget.
Jeremy Thurgood <firxen@gmail.com>
parents:
36
diff
changeset
|
327 self.tvw.reupdate() |
9 | 328 |
329 def loop(self): | |
25
6d6ab0c1479d
Add placing some chickens and foxes
Neil Muller <drnlmuller@gmail.com>
parents:
24
diff
changeset
|
330 self.tv.loop() |
9 | 331 |
162 | 332 def set_selected_tool(self, tool, cursor): |
223 | 333 if not self.day: |
334 return | |
35 | 335 self.selected_tool = tool |
213
07b361ebd87f
Ensure we clean up highlights, etc.
Neil Muller <drnlmuller@gmail.com>
parents:
212
diff
changeset
|
336 if self.animal_to_place: |
07b361ebd87f
Ensure we clean up highlights, etc.
Neil Muller <drnlmuller@gmail.com>
parents:
212
diff
changeset
|
337 # Clear any highlights |
305
32149b1d9fd2
Capitalised all equipment names.
Jeremy Thurgood <firxen@gmail.com>
parents:
303
diff
changeset
|
338 self.animal_to_place.unequip_by_name("Spotlight") |
200
67d10f7e0159
selected chickens are selected
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
197
diff
changeset
|
339 self.select_animal_to_place(None) |
203
653da96db572
Fixed dangling cursor sprite and did some TODO list maintenance.
Jeremy Thurgood <firxen@gmail.com>
parents:
202
diff
changeset
|
340 sprite_curs = None |
653da96db572
Fixed dangling cursor sprite and did some TODO list maintenance.
Jeremy Thurgood <firxen@gmail.com>
parents:
202
diff
changeset
|
341 if buildings.is_building(tool): |
232
0bd214cf9018
Overlay cost on building sprite cursors.
Simon Cross <hodgestar@gmail.com>
parents:
228
diff
changeset
|
342 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
|
343 elif equipment.is_equipment(tool): |
5b9cd693fe7c
Add sprite cursors for equipment buying.
Simon Cross <hodgestar@gmail.com>
parents:
245
diff
changeset
|
344 sprite_curs = sprite_cursor.SpriteCursor(tool.CHICKEN_IMAGE_FILE, self.tv) |
203
653da96db572
Fixed dangling cursor sprite and did some TODO list maintenance.
Jeremy Thurgood <firxen@gmail.com>
parents:
202
diff
changeset
|
345 self.set_cursor(cursor, sprite_curs) |
653da96db572
Fixed dangling cursor sprite and did some TODO list maintenance.
Jeremy Thurgood <firxen@gmail.com>
parents:
202
diff
changeset
|
346 |
653da96db572
Fixed dangling cursor sprite and did some TODO list maintenance.
Jeremy Thurgood <firxen@gmail.com>
parents:
202
diff
changeset
|
347 def set_cursor(self, cursor=None, sprite_curs=None): |
162 | 348 if cursor: |
349 pygame.mouse.set_cursor(*cursor) | |
350 else: | |
351 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
|
352 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
|
353 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
|
354 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
|
355 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
|
356 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
|
357 |
07b361ebd87f
Ensure we clean up highlights, etc.
Neil Muller <drnlmuller@gmail.com>
parents:
212
diff
changeset
|
358 def reset_states(self): |
07b361ebd87f
Ensure we clean up highlights, etc.
Neil Muller <drnlmuller@gmail.com>
parents:
212
diff
changeset
|
359 """Clear current states (highlights, etc.)""" |
245
634491bf37e8
Change toolbar to gui.Toolbar -- gives nicer highlighting.
Simon Cross <hodgestar@gmail.com>
parents:
243
diff
changeset
|
360 self.set_selected_tool(None, None) |
634491bf37e8
Change toolbar to gui.Toolbar -- gives nicer highlighting.
Simon Cross <hodgestar@gmail.com>
parents:
243
diff
changeset
|
361 self.toolbar.clear_tool() |
17
cbbc5da7708a
Interaction with the game board.
Jeremy Thurgood <firxen@gmail.com>
parents:
14
diff
changeset
|
362 |
186
f06010d34cd3
Add sprite cursors for building placement.
Simon Cross <hodgestar@gmail.com>
parents:
183
diff
changeset
|
363 def update_sprite_cursor(self, e): |
f06010d34cd3
Add sprite cursors for building placement.
Simon Cross <hodgestar@gmail.com>
parents:
183
diff
changeset
|
364 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
|
365 self.sprite_cursor.set_pos(tile_pos) |
f06010d34cd3
Add sprite cursors for building placement.
Simon Cross <hodgestar@gmail.com>
parents:
183
diff
changeset
|
366 |
223 | 367 def start_night(self): |
368 self.day, self.night = False, True | |
369 self.tv.sun(False) | |
370 self.reset_states() | |
320
9bf0e701a36e
Switch between 'Finished Day' and 'Fast Forward' modes
Neil Muller <drnlmuller@gmail.com>
parents:
316
diff
changeset
|
371 self.toolbar.update_fin_tool(self.day) |
413
bdc4757e0497
Add Sniper Rifle and give guns limited ammunition.
Jeremy Thurgood <firxen@gmail.com>
parents:
408
diff
changeset
|
372 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
|
373 self.eggs = 0 |
419
d110d55c8449
Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents:
414
diff
changeset
|
374 for chicken in self.chickens.copy(): |
414
9096c237928c
Dear most illustrious brother, I seek your cooperation with the refactoring of egg layerings and the reloading of guns. Please to provide bank details.
Jeremy Thurgood <firxen@gmail.com>
parents:
413
diff
changeset
|
375 chicken.start_night(self) |
9096c237928c
Dear most illustrious brother, I seek your cooperation with the refactoring of egg layerings and the reloading of guns. Please to provide bank details.
Jeremy Thurgood <firxen@gmail.com>
parents:
413
diff
changeset
|
376 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
|
377 self._cache_animal_positions() |
223 | 378 |
379 def start_day(self): | |
380 self.day, self.night = True, False | |
381 self.tv.sun(True) | |
382 self.reset_states() | |
320
9bf0e701a36e
Switch between 'Finished Day' and 'Fast Forward' modes
Neil Muller <drnlmuller@gmail.com>
parents:
316
diff
changeset
|
383 self.toolbar.update_fin_tool(self.day) |
401
7405f7db469f
Tweak fox attack logic - we no longer ignore chickens we accidently step on
Neil Muller <drnlmuller@gmail.com>
parents:
400
diff
changeset
|
384 self._pos_cache = { 'fox' : [], 'chicken' : []} |
413
bdc4757e0497
Add Sniper Rifle and give guns limited ammunition.
Jeremy Thurgood <firxen@gmail.com>
parents:
408
diff
changeset
|
385 self.advance_day() |
bdc4757e0497
Add Sniper Rifle and give guns limited ammunition.
Jeremy Thurgood <firxen@gmail.com>
parents:
408
diff
changeset
|
386 self.clear_foxes() |
419
d110d55c8449
Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents:
414
diff
changeset
|
387 for chicken in self.chickens.copy(): |
d110d55c8449
Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents:
414
diff
changeset
|
388 chicken.start_day(self) |
d110d55c8449
Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents:
414
diff
changeset
|
389 self.toolbar.update_egg_counter(self.eggs) |
223 | 390 |
69
18db99fda6bd
Move spawing code from engine to gameboard - seems more natural.
Neil Muller <drnlmuller@gmail.com>
parents:
68
diff
changeset
|
391 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
|
392 """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
|
393 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
|
394 return False |
18db99fda6bd
Move spawing code from engine to gameboard - seems more natural.
Neil Muller <drnlmuller@gmail.com>
parents:
68
diff
changeset
|
395 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
|
396 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
|
397 return False |
18db99fda6bd
Move spawing code from engine to gameboard - seems more natural.
Neil Muller <drnlmuller@gmail.com>
parents:
68
diff
changeset
|
398 return True |
18db99fda6bd
Move spawing code from engine to gameboard - seems more natural.
Neil Muller <drnlmuller@gmail.com>
parents:
68
diff
changeset
|
399 |
17
cbbc5da7708a
Interaction with the game board.
Jeremy Thurgood <firxen@gmail.com>
parents:
14
diff
changeset
|
400 def use_tool(self, e): |
223 | 401 if not self.day: |
402 return | |
189
37af9e5dd292
Use tool with left button, cancel tool with right button.
Jeremy Thurgood <firxen@gmail.com>
parents:
186
diff
changeset
|
403 if e.button == 3: # Right button |
275
678be1afc307
Fix minor bug in clearing of tool state on right-click.
Simon Cross <hodgestar@gmail.com>
parents:
272
diff
changeset
|
404 self.set_selected_tool(None, None) |
678be1afc307
Fix minor bug in clearing of tool state on right-click.
Simon Cross <hodgestar@gmail.com>
parents:
272
diff
changeset
|
405 self.toolbar.clear_tool() |
189
37af9e5dd292
Use tool with left button, cancel tool with right button.
Jeremy Thurgood <firxen@gmail.com>
parents:
186
diff
changeset
|
406 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
|
407 return |
52
0d4799866bcf
Sell chickens and buy fences.
Jeremy Thurgood <firxen@gmail.com>
parents:
40
diff
changeset
|
408 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
|
409 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
|
410 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
|
411 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
|
412 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
|
413 self.place_animal(self.tv.screen_to_tile(e.pos)) |
65
7e9c8ad06d32
Implement building selling.
Simon Cross <hodgestar@gmail.com>
parents:
64
diff
changeset
|
414 elif self.selected_tool == constants.TOOL_SELL_BUILDING: |
7e9c8ad06d32
Implement building selling.
Simon Cross <hodgestar@gmail.com>
parents:
64
diff
changeset
|
415 self.sell_building(self.tv.screen_to_tile(e.pos)) |
164
ab90040013a7
Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents:
162
diff
changeset
|
416 elif self.selected_tool == constants.TOOL_SELL_EQUIPMENT: |
ab90040013a7
Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents:
162
diff
changeset
|
417 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
|
418 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
|
419 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
|
420 elif buildings.is_building(self.selected_tool): |
65
7e9c8ad06d32
Implement building selling.
Simon Cross <hodgestar@gmail.com>
parents:
64
diff
changeset
|
421 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
|
422 elif equipment.is_equipment(self.selected_tool): |
48019afde338
Equipment purchasing and some toolbar tweaks.
Jeremy Thurgood <firxen@gmail.com>
parents:
108
diff
changeset
|
423 self.buy_equipment(self.tv.screen_to_tile(e.pos), self.selected_tool) |
17
cbbc5da7708a
Interaction with the game board.
Jeremy Thurgood <firxen@gmail.com>
parents:
14
diff
changeset
|
424 |
166
4aa800354b7c
Rename get_chicken to get_outside_chicken.
Simon Cross <hodgestar@gmail.com>
parents:
165
diff
changeset
|
425 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
|
426 for chick in self.chickens: |
164
ab90040013a7
Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents:
162
diff
changeset
|
427 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
|
428 return chick |
b8f64db0d39e
Cleaned up buying and selling a bit.
Jeremy Thurgood <firxen@gmail.com>
parents:
52
diff
changeset
|
429 return None |
57
08665fa60345
Implement henhouses and henhouse adding.
Simon Cross <hodgestar@gmail.com>
parents:
54
diff
changeset
|
430 |
105
7910b4e01dba
Add chicken moving tool and start of animal placement.
Simon Cross <hodgestar@gmail.com>
parents:
98
diff
changeset
|
431 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
|
432 for building in self.buildings: |
7910b4e01dba
Add chicken moving tool and start of animal placement.
Simon Cross <hodgestar@gmail.com>
parents:
98
diff
changeset
|
433 if building.covers(tile_pos): |
7910b4e01dba
Add chicken moving tool and start of animal placement.
Simon Cross <hodgestar@gmail.com>
parents:
98
diff
changeset
|
434 return building |
7910b4e01dba
Add chicken moving tool and start of animal placement.
Simon Cross <hodgestar@gmail.com>
parents:
98
diff
changeset
|
435 return None |
7910b4e01dba
Add chicken moving tool and start of animal placement.
Simon Cross <hodgestar@gmail.com>
parents:
98
diff
changeset
|
436 |
7910b4e01dba
Add chicken moving tool and start of animal placement.
Simon Cross <hodgestar@gmail.com>
parents:
98
diff
changeset
|
437 def sell_chicken(self, tile_pos): |
192
a490ee2ef446
Allow selling of chickens in henhouses
Neil Muller <drnlmuller@gmail.com>
parents:
191
diff
changeset
|
438 |
310
49c58dda8ac2
Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents:
307
diff
changeset
|
439 def do_sell(chicken, update_button=None): |
192
a490ee2ef446
Allow selling of chickens in henhouses
Neil Muller <drnlmuller@gmail.com>
parents:
191
diff
changeset
|
440 if not chicken: |
a490ee2ef446
Allow selling of chickens in henhouses
Neil Muller <drnlmuller@gmail.com>
parents:
191
diff
changeset
|
441 return False # sanity check |
a490ee2ef446
Allow selling of chickens in henhouses
Neil Muller <drnlmuller@gmail.com>
parents:
191
diff
changeset
|
442 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
|
443 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
|
444 TextDialog("Squuaaawwwwwk!", msg).open() |
192
a490ee2ef446
Allow selling of chickens in henhouses
Neil Muller <drnlmuller@gmail.com>
parents:
191
diff
changeset
|
445 return False |
228
f74de4280e20
Sell chicken's equipment when you sell the chicken.
Simon Cross <hodgestar@gmail.com>
parents:
227
diff
changeset
|
446 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
|
447 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
|
448 chicken.unequip(item) |
389
463802281182
Add basic level support (level choosing needs work)
Neil Muller <drnlmuller@gmail.com>
parents:
382
diff
changeset
|
449 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
|
450 sound.play_sound("sell-chicken.ogg") |
310
49c58dda8ac2
Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents:
307
diff
changeset
|
451 if update_button: |
49c58dda8ac2
Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents:
307
diff
changeset
|
452 update_button(chicken, empty=True) |
49c58dda8ac2
Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents:
307
diff
changeset
|
453 self.remove_chicken(chicken) |
192
a490ee2ef446
Allow selling of chickens in henhouses
Neil Muller <drnlmuller@gmail.com>
parents:
191
diff
changeset
|
454 return True |
a490ee2ef446
Allow selling of chickens in henhouses
Neil Muller <drnlmuller@gmail.com>
parents:
191
diff
changeset
|
455 |
166
4aa800354b7c
Rename get_chicken to get_outside_chicken.
Simon Cross <hodgestar@gmail.com>
parents:
165
diff
changeset
|
456 chick = self.get_outside_chicken(tile_pos) |
54
b8f64db0d39e
Cleaned up buying and selling a bit.
Jeremy Thurgood <firxen@gmail.com>
parents:
52
diff
changeset
|
457 if chick is None: |
192
a490ee2ef446
Allow selling of chickens in henhouses
Neil Muller <drnlmuller@gmail.com>
parents:
191
diff
changeset
|
458 building = self.get_building(tile_pos) |
414
9096c237928c
Dear most illustrious brother, I seek your cooperation with the refactoring of egg layerings and the reloading of guns. Please to provide bank details.
Jeremy Thurgood <firxen@gmail.com>
parents:
413
diff
changeset
|
459 if building and building.HENHOUSE: |
192
a490ee2ef446
Allow selling of chickens in henhouses
Neil Muller <drnlmuller@gmail.com>
parents:
191
diff
changeset
|
460 self.open_building_dialog(building, do_sell) |
54
b8f64db0d39e
Cleaned up buying and selling a bit.
Jeremy Thurgood <firxen@gmail.com>
parents:
52
diff
changeset
|
461 return |
310
49c58dda8ac2
Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents:
307
diff
changeset
|
462 do_sell(chick) |
192
a490ee2ef446
Allow selling of chickens in henhouses
Neil Muller <drnlmuller@gmail.com>
parents:
191
diff
changeset
|
463 |
243
4f86c2616cdf
Variable number of eggs for chickens
Neil Muller <drnlmuller@gmail.com>
parents:
241
diff
changeset
|
464 def sell_one_egg(self, chicken): |
4f86c2616cdf
Variable number of eggs for chickens
Neil Muller <drnlmuller@gmail.com>
parents:
241
diff
changeset
|
465 if chicken.eggs: |
389
463802281182
Add basic level support (level choosing needs work)
Neil Muller <drnlmuller@gmail.com>
parents:
382
diff
changeset
|
466 self.add_cash(self.level.sell_price_egg) |
243
4f86c2616cdf
Variable number of eggs for chickens
Neil Muller <drnlmuller@gmail.com>
parents:
241
diff
changeset
|
467 chicken.remove_one_egg() |
4f86c2616cdf
Variable number of eggs for chickens
Neil Muller <drnlmuller@gmail.com>
parents:
241
diff
changeset
|
468 self.eggs -= 1 |
4f86c2616cdf
Variable number of eggs for chickens
Neil Muller <drnlmuller@gmail.com>
parents:
241
diff
changeset
|
469 self.toolbar.update_egg_counter(self.eggs) |
4f86c2616cdf
Variable number of eggs for chickens
Neil Muller <drnlmuller@gmail.com>
parents:
241
diff
changeset
|
470 return True |
4f86c2616cdf
Variable number of eggs for chickens
Neil Muller <drnlmuller@gmail.com>
parents:
241
diff
changeset
|
471 return False |
4f86c2616cdf
Variable number of eggs for chickens
Neil Muller <drnlmuller@gmail.com>
parents:
241
diff
changeset
|
472 |
192
a490ee2ef446
Allow selling of chickens in henhouses
Neil Muller <drnlmuller@gmail.com>
parents:
191
diff
changeset
|
473 def sell_egg(self, tile_pos): |
310
49c58dda8ac2
Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents:
307
diff
changeset
|
474 def do_sell(chicken, update_button=None): |
243
4f86c2616cdf
Variable number of eggs for chickens
Neil Muller <drnlmuller@gmail.com>
parents:
241
diff
changeset
|
475 # We try sell and egg |
4f86c2616cdf
Variable number of eggs for chickens
Neil Muller <drnlmuller@gmail.com>
parents:
241
diff
changeset
|
476 if self.sell_one_egg(chicken): |
193 | 477 sound.play_sound("sell-chicken.ogg") |
243
4f86c2616cdf
Variable number of eggs for chickens
Neil Muller <drnlmuller@gmail.com>
parents:
241
diff
changeset
|
478 # Force toolbar update |
193 | 479 self.toolbar.chsize() |
310
49c58dda8ac2
Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents:
307
diff
changeset
|
480 if update_button: |
49c58dda8ac2
Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents:
307
diff
changeset
|
481 update_button(chicken) |
192
a490ee2ef446
Allow selling of chickens in henhouses
Neil Muller <drnlmuller@gmail.com>
parents:
191
diff
changeset
|
482 return False |
193 | 483 |
192
a490ee2ef446
Allow selling of chickens in henhouses
Neil Muller <drnlmuller@gmail.com>
parents:
191
diff
changeset
|
484 building = self.get_building(tile_pos) |
414
9096c237928c
Dear most illustrious brother, I seek your cooperation with the refactoring of egg layerings and the reloading of guns. Please to provide bank details.
Jeremy Thurgood <firxen@gmail.com>
parents:
413
diff
changeset
|
485 if building and building.HENHOUSE: |
193 | 486 self.open_building_dialog(building, do_sell) |
54
b8f64db0d39e
Cleaned up buying and selling a bit.
Jeremy Thurgood <firxen@gmail.com>
parents:
52
diff
changeset
|
487 |
200
67d10f7e0159
selected chickens are selected
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
197
diff
changeset
|
488 def select_animal_to_place(self, animal): |
67d10f7e0159
selected chickens are selected
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
197
diff
changeset
|
489 if self.animal_to_place: |
305
32149b1d9fd2
Capitalised all equipment names.
Jeremy Thurgood <firxen@gmail.com>
parents:
303
diff
changeset
|
490 self.animal_to_place.unequip_by_name("Spotlight") |
200
67d10f7e0159
selected chickens are selected
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
197
diff
changeset
|
491 self.animal_to_place = animal |
67d10f7e0159
selected chickens are selected
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
197
diff
changeset
|
492 if self.animal_to_place: |
67d10f7e0159
selected chickens are selected
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
197
diff
changeset
|
493 self.animal_to_place.equip(equipment.Spotlight()) |
67d10f7e0159
selected chickens are selected
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
197
diff
changeset
|
494 |
105
7910b4e01dba
Add chicken moving tool and start of animal placement.
Simon Cross <hodgestar@gmail.com>
parents:
98
diff
changeset
|
495 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
|
496 """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
|
497 |
7910b4e01dba
Add chicken moving tool and start of animal placement.
Simon Cross <hodgestar@gmail.com>
parents:
98
diff
changeset
|
498 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
|
499 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
|
500 """ |
166
4aa800354b7c
Rename get_chicken to get_outside_chicken.
Simon Cross <hodgestar@gmail.com>
parents:
165
diff
changeset
|
501 chicken = self.get_outside_chicken(tile_pos) |
164
ab90040013a7
Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents:
162
diff
changeset
|
502 if chicken: |
108
437cbd856a03
Add occupants and abodes. Allowing moving chickens around.
Simon Cross <hodgestar@gmail.com>
parents:
105
diff
changeset
|
503 if chicken is self.animal_to_place: |
200
67d10f7e0159
selected chickens are selected
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
197
diff
changeset
|
504 self.select_animal_to_place(None) |
165 | 505 pygame.mouse.set_cursor(*cursors.cursors['select']) |
108
437cbd856a03
Add occupants and abodes. Allowing moving chickens around.
Simon Cross <hodgestar@gmail.com>
parents:
105
diff
changeset
|
506 else: |
200
67d10f7e0159
selected chickens are selected
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
197
diff
changeset
|
507 self.select_animal_to_place(chicken) |
162 | 508 pygame.mouse.set_cursor(*cursors.cursors['chicken']) |
105
7910b4e01dba
Add chicken moving tool and start of animal placement.
Simon Cross <hodgestar@gmail.com>
parents:
98
diff
changeset
|
509 return |
7910b4e01dba
Add chicken moving tool and start of animal placement.
Simon Cross <hodgestar@gmail.com>
parents:
98
diff
changeset
|
510 building = self.get_building(tile_pos) |
378
71f5897ac5ef
Fences are now buildings, with appropriate (but ugly) UI changes.
Jeremy Thurgood <firxen@gmail.com>
parents:
361
diff
changeset
|
511 if building and building.ABODE: |
197
d74693555b86
Put chickens into first empty space in buildings to make it easier to add lots of chickens.
Simon Cross <hodgestar@gmail.com>
parents:
194
diff
changeset
|
512 if self.animal_to_place: |
d74693555b86
Put chickens into first empty space in buildings to make it easier to add lots of chickens.
Simon Cross <hodgestar@gmail.com>
parents:
194
diff
changeset
|
513 try: |
d74693555b86
Put chickens into first empty space in buildings to make it easier to add lots of chickens.
Simon Cross <hodgestar@gmail.com>
parents:
194
diff
changeset
|
514 place = building.first_empty_place() |
d74693555b86
Put chickens into first empty space in buildings to make it easier to add lots of chickens.
Simon Cross <hodgestar@gmail.com>
parents:
194
diff
changeset
|
515 self.relocate_animal(self.animal_to_place, place=place) |
201
fe1e9c18d4d7
layering bugfix; indoor chickens now use normal chicken icons
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
200
diff
changeset
|
516 self.animal_to_place.equip(equipment.Nest()) |
200
67d10f7e0159
selected chickens are selected
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
197
diff
changeset
|
517 self.select_animal_to_place(None) |
197
d74693555b86
Put chickens into first empty space in buildings to make it easier to add lots of chickens.
Simon Cross <hodgestar@gmail.com>
parents:
194
diff
changeset
|
518 pygame.mouse.set_cursor(*cursors.cursors['select']) |
d74693555b86
Put chickens into first empty space in buildings to make it easier to add lots of chickens.
Simon Cross <hodgestar@gmail.com>
parents:
194
diff
changeset
|
519 except buildings.BuildingFullError: |
d74693555b86
Put chickens into first empty space in buildings to make it easier to add lots of chickens.
Simon Cross <hodgestar@gmail.com>
parents:
194
diff
changeset
|
520 pass |
d74693555b86
Put chickens into first empty space in buildings to make it easier to add lots of chickens.
Simon Cross <hodgestar@gmail.com>
parents:
194
diff
changeset
|
521 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
|
522 self.open_building_dialog(building) |
108
437cbd856a03
Add occupants and abodes. Allowing moving chickens around.
Simon Cross <hodgestar@gmail.com>
parents:
105
diff
changeset
|
523 return |
437cbd856a03
Add occupants and abodes. Allowing moving chickens around.
Simon Cross <hodgestar@gmail.com>
parents:
105
diff
changeset
|
524 if self.tv.get(tile_pos) == self.GRASSLAND: |
437cbd856a03
Add occupants and abodes. Allowing moving chickens around.
Simon Cross <hodgestar@gmail.com>
parents:
105
diff
changeset
|
525 if self.animal_to_place is not None: |
305
32149b1d9fd2
Capitalised all equipment names.
Jeremy Thurgood <firxen@gmail.com>
parents:
303
diff
changeset
|
526 self.animal_to_place.unequip_by_name("Nest") |
197
d74693555b86
Put chickens into first empty space in buildings to make it easier to add lots of chickens.
Simon Cross <hodgestar@gmail.com>
parents:
194
diff
changeset
|
527 self.relocate_animal(self.animal_to_place, tile_pos=tile_pos) |
243
4f86c2616cdf
Variable number of eggs for chickens
Neil Muller <drnlmuller@gmail.com>
parents:
241
diff
changeset
|
528 self.eggs -= self.animal_to_place.get_num_eggs() |
4f86c2616cdf
Variable number of eggs for chickens
Neil Muller <drnlmuller@gmail.com>
parents:
241
diff
changeset
|
529 self.animal_to_place.remove_eggs() |
4f86c2616cdf
Variable number of eggs for chickens
Neil Muller <drnlmuller@gmail.com>
parents:
241
diff
changeset
|
530 self.toolbar.update_egg_counter(self.eggs) |
197
d74693555b86
Put chickens into first empty space in buildings to make it easier to add lots of chickens.
Simon Cross <hodgestar@gmail.com>
parents:
194
diff
changeset
|
531 |
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
|
532 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
|
533 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
|
534 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
|
535 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
|
536 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
|
537 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
|
538 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
|
539 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
|
540 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
|
541 self.set_visibility(chicken) |
125 | 542 |
397
532f1ea476ff
Make foxes enter buildings, with a seperate count for them
Neil Muller <drnlmuller@gmail.com>
parents:
396
diff
changeset
|
543 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
|
544 if animal.outside(): |
532f1ea476ff
Make foxes enter buildings, with a seperate count for them
Neil Muller <drnlmuller@gmail.com>
parents:
396
diff
changeset
|
545 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
|
546 self.tv.sprites.append(animal) |
125 | 547 else: |
397
532f1ea476ff
Make foxes enter buildings, with a seperate count for them
Neil Muller <drnlmuller@gmail.com>
parents:
396
diff
changeset
|
548 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
|
549 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
|
550 |
302
01c1682dc250
Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
298
diff
changeset
|
551 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
|
552 """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
|
553 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
|
554 |
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
|
555 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
|
556 self.disp.close(tbl) |
170
92d11e0544bc
Switch building to selected image when building is selected.
Simon Cross <hodgestar@gmail.com>
parents:
169
diff
changeset
|
557 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
|
558 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
|
559 |
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
|
560 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
|
561 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
|
562 |
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
|
563 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
|
564 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
|
565 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
|
566 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
|
567 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
|
568 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
|
569 |
302
01c1682dc250
Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
298
diff
changeset
|
570 if x: |
01c1682dc250
Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
298
diff
changeset
|
571 offset = (self.disp.rect.center[0] + x, |
01c1682dc250
Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
298
diff
changeset
|
572 self.disp.rect.center[1] + y) |
01c1682dc250
Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
298
diff
changeset
|
573 else: |
01c1682dc250
Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
298
diff
changeset
|
574 offset = None |
01c1682dc250
Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
298
diff
changeset
|
575 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
|
576 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
|
577 |
192
a490ee2ef446
Allow selling of chickens in henhouses
Neil Muller <drnlmuller@gmail.com>
parents:
191
diff
changeset
|
578 def open_building_dialog(self, building, sell_callback=None): |
115
2b2007e231da
Start of dialog for placing chickens in buildings. Remove chicken in hen house bug by not allowing chickens in hen houses.
Simon Cross <hodgestar@gmail.com>
parents:
109
diff
changeset
|
579 """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
|
580 |
f82d17f99882
Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents:
203
diff
changeset
|
581 place_button_map = {} |
f82d17f99882
Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents:
203
diff
changeset
|
582 |
f82d17f99882
Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents:
203
diff
changeset
|
583 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
|
584 """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
|
585 if animal: |
f82d17f99882
Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents:
203
diff
changeset
|
586 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
|
587 if button: |
f82d17f99882
Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents:
203
diff
changeset
|
588 if empty: |
f82d17f99882
Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents:
203
diff
changeset
|
589 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
|
590 else: |
f82d17f99882
Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents:
203
diff
changeset
|
591 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
|
592 |
f82d17f99882
Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents:
203
diff
changeset
|
593 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
|
594 """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
|
595 if place.occupant: |
f82d17f99882
Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents:
203
diff
changeset
|
596 # 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
|
597 if not sell_callback: |
f82d17f99882
Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents:
203
diff
changeset
|
598 old_animal = self.animal_to_place |
f82d17f99882
Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents:
203
diff
changeset
|
599 self.select_animal_to_place(place.occupant) |
f82d17f99882
Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents:
203
diff
changeset
|
600 # deselect old animal (on button) |
f82d17f99882
Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents:
203
diff
changeset
|
601 update_button(old_animal) |
f82d17f99882
Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents:
203
diff
changeset
|
602 # select new animal (on button) |
f82d17f99882
Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents:
203
diff
changeset
|
603 update_button(self.animal_to_place) |
f82d17f99882
Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents:
203
diff
changeset
|
604 else: |
f82d17f99882
Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents:
203
diff
changeset
|
605 # Attempt to sell the occupant |
310
49c58dda8ac2
Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents:
307
diff
changeset
|
606 sell_callback(place.occupant, update_button) |
192
a490ee2ef446
Allow selling of chickens in henhouses
Neil Muller <drnlmuller@gmail.com>
parents:
191
diff
changeset
|
607 else: |
208
f82d17f99882
Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents:
203
diff
changeset
|
608 # there is no occupant, attempt to fill the space |
f82d17f99882
Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents:
203
diff
changeset
|
609 if self.animal_to_place is not None: |
f82d17f99882
Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents:
203
diff
changeset
|
610 # empty old nest (on button) |
f82d17f99882
Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents:
203
diff
changeset
|
611 update_button(self.animal_to_place, empty=True) |
f82d17f99882
Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents:
203
diff
changeset
|
612 self.relocate_animal(self.animal_to_place, place=place) |
f82d17f99882
Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents:
203
diff
changeset
|
613 # populate the new nest (on button) |
f82d17f99882
Fix bugs in clicking around inside buildings while moving chickens.
Simon Cross <hodgestar@gmail.com>
parents:
203
diff
changeset
|
614 update_button(self.animal_to_place) |
125 | 615 |
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
|
616 tbl = gui.Table() |
125 | 617 columns = building.max_floor_width() |
618 kwargs = { 'style': { 'padding_left': 10, 'padding_bottom': 10 }} | |
619 for floor in building.floors(): | |
620 tbl.tr() | |
621 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
|
622 tbl.tr() |
125 | 623 for row in floor.rows(): |
624 tbl.tr() | |
625 for place in row: | |
626 if place.occupant is None: | |
627 button = gui.Button(icons.EMPTY_NEST_ICON) | |
628 else: | |
201
fe1e9c18d4d7
layering bugfix; indoor chickens now use normal chicken icons
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
200
diff
changeset
|
629 button = gui.Button(icons.animal_icon(place.occupant)) |
125 | 630 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
|
631 button.connect(gui.CLICK, nest_clicked, place, button) |
125 | 632 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
|
633 |
170
92d11e0544bc
Switch building to selected image when building is selected.
Simon Cross <hodgestar@gmail.com>
parents:
169
diff
changeset
|
634 building.selected(True) |
92d11e0544bc
Switch building to selected image when building is selected.
Simon Cross <hodgestar@gmail.com>
parents:
169
diff
changeset
|
635 def close_callback(): |
92d11e0544bc
Switch building to selected image when building is selected.
Simon Cross <hodgestar@gmail.com>
parents:
169
diff
changeset
|
636 building.selected(False) |
92d11e0544bc
Switch building to selected image when building is selected.
Simon Cross <hodgestar@gmail.com>
parents:
169
diff
changeset
|
637 |
262
d508248041ff
avoid passing events in twice
Neil Muller <drnlmuller@gmail.com>
parents:
258
diff
changeset
|
638 def evict_callback(): |
264 | 639 if not self.animal_to_place: |
640 return | |
641 for tile_pos in building.adjacent_tiles(): | |
642 if self.tv.get(tile_pos) != self.GRASSLAND: | |
643 continue | |
644 if self.get_outside_chicken(tile_pos) is None: | |
645 update_button(self.animal_to_place, empty=True) | |
646 self.place_animal(tile_pos) | |
647 break | |
262
d508248041ff
avoid passing events in twice
Neil Muller <drnlmuller@gmail.com>
parents:
258
diff
changeset
|
648 |
d508248041ff
avoid passing events in twice
Neil Muller <drnlmuller@gmail.com>
parents:
258
diff
changeset
|
649 if not sell_callback: |
d508248041ff
avoid passing events in twice
Neil Muller <drnlmuller@gmail.com>
parents:
258
diff
changeset
|
650 tbl.tr() |
d508248041ff
avoid passing events in twice
Neil Muller <drnlmuller@gmail.com>
parents:
258
diff
changeset
|
651 button = gui.Button('Evict') |
d508248041ff
avoid passing events in twice
Neil Muller <drnlmuller@gmail.com>
parents:
258
diff
changeset
|
652 button.connect(gui.CLICK, evict_callback) |
d508248041ff
avoid passing events in twice
Neil Muller <drnlmuller@gmail.com>
parents:
258
diff
changeset
|
653 tbl.td(button, colspan=2, **kwargs) |
d508248041ff
avoid passing events in twice
Neil Muller <drnlmuller@gmail.com>
parents:
258
diff
changeset
|
654 |
170
92d11e0544bc
Switch building to selected image when building is selected.
Simon Cross <hodgestar@gmail.com>
parents:
169
diff
changeset
|
655 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
|
656 |
65
7e9c8ad06d32
Implement building selling.
Simon Cross <hodgestar@gmail.com>
parents:
64
diff
changeset
|
657 def buy_building(self, tile_pos, building_cls): |
7e9c8ad06d32
Implement building selling.
Simon Cross <hodgestar@gmail.com>
parents:
64
diff
changeset
|
658 building = building_cls(tile_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
|
659 if self.cash < building.buy_price(): |
57
08665fa60345
Implement henhouses and henhouse adding.
Simon Cross <hodgestar@gmail.com>
parents:
54
diff
changeset
|
660 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
|
661 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
|
662 return |
64
99fbb652ce8d
Refactor buildings so that new ones can be added just by adding a class to buildings.py.
Simon Cross <hodgestar@gmail.com>
parents:
60
diff
changeset
|
663 if building.place(self.tv): |
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
|
664 self.add_cash(-building.buy_price()) |
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
|
665 self.add_building(building) |
60
e2631c8e2cd6
Implement guard towers (with temporary sprite PNG).
Simon Cross <hodgestar@gmail.com>
parents:
57
diff
changeset
|
666 |
109
48019afde338
Equipment purchasing and some toolbar tweaks.
Jeremy Thurgood <firxen@gmail.com>
parents:
108
diff
changeset
|
667 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
|
668 |
109
48019afde338
Equipment purchasing and some toolbar tweaks.
Jeremy Thurgood <firxen@gmail.com>
parents:
108
diff
changeset
|
669 equipment = equipment_cls() |
298
88a626202591
Buy equipment for chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
294
diff
changeset
|
670 |
310
49c58dda8ac2
Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents:
307
diff
changeset
|
671 def do_equip(chicken, update_button=None): |
298
88a626202591
Buy equipment for chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
294
diff
changeset
|
672 # 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
|
673 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
|
674 return False |
298
88a626202591
Buy equipment for chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
294
diff
changeset
|
675 if equipment.place(chicken): |
88a626202591
Buy equipment for chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
294
diff
changeset
|
676 self.add_cash(-equipment.buy_price()) |
88a626202591
Buy equipment for chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
294
diff
changeset
|
677 chicken.equip(equipment) |
310
49c58dda8ac2
Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents:
307
diff
changeset
|
678 if update_button: |
49c58dda8ac2
Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents:
307
diff
changeset
|
679 update_button(chicken) |
298
88a626202591
Buy equipment for chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
294
diff
changeset
|
680 return False |
88a626202591
Buy equipment for chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
294
diff
changeset
|
681 |
88a626202591
Buy equipment for chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
294
diff
changeset
|
682 chicken = self.get_outside_chicken(tile_pos) |
88a626202591
Buy equipment for chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
294
diff
changeset
|
683 if chicken is None: |
88a626202591
Buy equipment for chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
294
diff
changeset
|
684 building = self.get_building(tile_pos) |
378
71f5897ac5ef
Fences are now buildings, with appropriate (but ugly) UI changes.
Jeremy Thurgood <firxen@gmail.com>
parents:
361
diff
changeset
|
685 if not (building and building.ABODE): |
298
88a626202591
Buy equipment for chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
294
diff
changeset
|
686 return |
88a626202591
Buy equipment for chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
294
diff
changeset
|
687 # Bounce through open dialog once more |
88a626202591
Buy equipment for chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
294
diff
changeset
|
688 self.open_building_dialog(building, do_equip) |
88a626202591
Buy equipment for chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
294
diff
changeset
|
689 else: |
88a626202591
Buy equipment for chickens in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
294
diff
changeset
|
690 do_equip(chicken) |
109
48019afde338
Equipment purchasing and some toolbar tweaks.
Jeremy Thurgood <firxen@gmail.com>
parents:
108
diff
changeset
|
691 |
65
7e9c8ad06d32
Implement building selling.
Simon Cross <hodgestar@gmail.com>
parents:
64
diff
changeset
|
692 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
|
693 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
|
694 if building is None: |
7910b4e01dba
Add chicken moving tool and start of animal placement.
Simon Cross <hodgestar@gmail.com>
parents:
98
diff
changeset
|
695 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
|
696 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
|
697 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
|
698 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
|
699 return |
105
7910b4e01dba
Add chicken moving tool and start of animal placement.
Simon Cross <hodgestar@gmail.com>
parents:
98
diff
changeset
|
700 self.add_cash(building.sell_price()) |
7910b4e01dba
Add chicken moving tool and start of animal placement.
Simon Cross <hodgestar@gmail.com>
parents:
98
diff
changeset
|
701 building.remove(self.tv) |
7910b4e01dba
Add chicken moving tool and start of animal placement.
Simon Cross <hodgestar@gmail.com>
parents:
98
diff
changeset
|
702 self.remove_building(building) |
65
7e9c8ad06d32
Implement building selling.
Simon Cross <hodgestar@gmail.com>
parents:
64
diff
changeset
|
703 |
378
71f5897ac5ef
Fences are now buildings, with appropriate (but ugly) UI changes.
Jeremy Thurgood <firxen@gmail.com>
parents:
361
diff
changeset
|
704 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
|
705 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
|
706 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
|
707 return |
71f5897ac5ef
Fences are now buildings, with appropriate (but ugly) UI changes.
Jeremy Thurgood <firxen@gmail.com>
parents:
361
diff
changeset
|
708 self.add_cash(-building.repair_price()) |
71f5897ac5ef
Fences are now buildings, with appropriate (but ugly) UI changes.
Jeremy Thurgood <firxen@gmail.com>
parents:
361
diff
changeset
|
709 building.repair(self.tv) |
71f5897ac5ef
Fences are now buildings, with appropriate (but ugly) UI changes.
Jeremy Thurgood <firxen@gmail.com>
parents:
361
diff
changeset
|
710 |
164
ab90040013a7
Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents:
162
diff
changeset
|
711 def sell_equipment(self, tile_pos): |
302
01c1682dc250
Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
298
diff
changeset
|
712 x, y = 0, 0 |
310
49c58dda8ac2
Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents:
307
diff
changeset
|
713 def do_sell(chicken, update_button=None): |
302
01c1682dc250
Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
298
diff
changeset
|
714 if not chicken.equipment: |
01c1682dc250
Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
298
diff
changeset
|
715 return |
01c1682dc250
Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
298
diff
changeset
|
716 elif len(chicken.equipment) == 1: |
01c1682dc250
Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
298
diff
changeset
|
717 item = chicken.equipment[0] |
01c1682dc250
Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
298
diff
changeset
|
718 self.add_cash(item.sell_price()) |
01c1682dc250
Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
298
diff
changeset
|
719 chicken.unequip(item) |
310
49c58dda8ac2
Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents:
307
diff
changeset
|
720 if update_button: |
49c58dda8ac2
Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents:
307
diff
changeset
|
721 update_button(chicken) |
302
01c1682dc250
Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
298
diff
changeset
|
722 else: |
310
49c58dda8ac2
Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents:
307
diff
changeset
|
723 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
|
724 return False |
01c1682dc250
Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
298
diff
changeset
|
725 |
166
4aa800354b7c
Rename get_chicken to get_outside_chicken.
Simon Cross <hodgestar@gmail.com>
parents:
165
diff
changeset
|
726 chicken = self.get_outside_chicken(tile_pos) |
302
01c1682dc250
Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
298
diff
changeset
|
727 if chicken is not None: |
01c1682dc250
Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
298
diff
changeset
|
728 do_sell(chicken) |
164
ab90040013a7
Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents:
162
diff
changeset
|
729 else: |
302
01c1682dc250
Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
298
diff
changeset
|
730 building = self.get_building(tile_pos) |
01c1682dc250
Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
298
diff
changeset
|
731 if building is None: |
01c1682dc250
Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
298
diff
changeset
|
732 return |
01c1682dc250
Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
298
diff
changeset
|
733 x, y = 50, 0 |
01c1682dc250
Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
298
diff
changeset
|
734 self.open_building_dialog(building, do_sell) |
164
ab90040013a7
Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents:
162
diff
changeset
|
735 |
310
49c58dda8ac2
Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents:
307
diff
changeset
|
736 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
|
737 tbl = gui.Table() |
ab90040013a7
Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents:
162
diff
changeset
|
738 |
ab90040013a7
Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents:
162
diff
changeset
|
739 def sell_item(item, button): |
ab90040013a7
Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents:
162
diff
changeset
|
740 """Select item of equipment.""" |
ab90040013a7
Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents:
162
diff
changeset
|
741 self.add_cash(item.sell_price()) |
ab90040013a7
Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents:
162
diff
changeset
|
742 chicken.unequip(item) |
310
49c58dda8ac2
Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents:
307
diff
changeset
|
743 if update_button: |
49c58dda8ac2
Refactor sell_callback, so sell_equipment work
Neil Muller <drnlmuller@gmail.com>
parents:
307
diff
changeset
|
744 update_button(chicken) |
169
946f09ed37cd
Make equipment dialog close after selecting an item to sell.
Simon Cross <hodgestar@gmail.com>
parents:
168
diff
changeset
|
745 self.disp.close(dialog) |
164
ab90040013a7
Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents:
162
diff
changeset
|
746 |
ab90040013a7
Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents:
162
diff
changeset
|
747 kwargs = { 'style': { 'padding_left': 10, 'padding_bottom': 10 }} |
ab90040013a7
Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents:
162
diff
changeset
|
748 |
ab90040013a7
Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents:
162
diff
changeset
|
749 tbl.tr() |
ab90040013a7
Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents:
162
diff
changeset
|
750 tbl.td(gui.Button("Sell ... "), align=-1, **kwargs) |
ab90040013a7
Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents:
162
diff
changeset
|
751 |
ab90040013a7
Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents:
162
diff
changeset
|
752 for item in chicken.equipment: |
ab90040013a7
Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents:
162
diff
changeset
|
753 tbl.tr() |
ab90040013a7
Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents:
162
diff
changeset
|
754 button = gui.Button(item.name().title()) |
ab90040013a7
Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents:
162
diff
changeset
|
755 button.connect(gui.CLICK, sell_item, item, button) |
ab90040013a7
Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents:
162
diff
changeset
|
756 tbl.td(button, align=1, **kwargs) |
ab90040013a7
Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents:
162
diff
changeset
|
757 |
302
01c1682dc250
Mostly working selling equipment in buildings
Neil Muller <drnlmuller@gmail.com>
parents:
298
diff
changeset
|
758 dialog = self.open_dialog(tbl, x=x, y=y) |
164
ab90040013a7
Implement equipment selling.
Simon Cross <hodgestar@gmail.com>
parents:
162
diff
changeset
|
759 |
14 | 760 def event(self, e): |
262
d508248041ff
avoid passing events in twice
Neil Muller <drnlmuller@gmail.com>
parents:
258
diff
changeset
|
761 if e.type == KEYDOWN and e.key in [K_UP, K_DOWN, K_LEFT, K_RIGHT]: |
39
ec79aabe2bf1
Scroll game window with arrow keys.
Jeremy Thurgood <firxen@gmail.com>
parents:
37
diff
changeset
|
762 if e.key == K_UP: |
ec79aabe2bf1
Scroll game window with arrow keys.
Jeremy Thurgood <firxen@gmail.com>
parents:
37
diff
changeset
|
763 self.tvw.move_view(0, -self.TILE_DIMENSIONS[1]) |
ec79aabe2bf1
Scroll game window with arrow keys.
Jeremy Thurgood <firxen@gmail.com>
parents:
37
diff
changeset
|
764 if e.key == K_DOWN: |
ec79aabe2bf1
Scroll game window with arrow keys.
Jeremy Thurgood <firxen@gmail.com>
parents:
37
diff
changeset
|
765 self.tvw.move_view(0, self.TILE_DIMENSIONS[1]) |
ec79aabe2bf1
Scroll game window with arrow keys.
Jeremy Thurgood <firxen@gmail.com>
parents:
37
diff
changeset
|
766 if e.key == K_LEFT: |
ec79aabe2bf1
Scroll game window with arrow keys.
Jeremy Thurgood <firxen@gmail.com>
parents:
37
diff
changeset
|
767 self.tvw.move_view(-self.TILE_DIMENSIONS[0], 0) |
ec79aabe2bf1
Scroll game window with arrow keys.
Jeremy Thurgood <firxen@gmail.com>
parents:
37
diff
changeset
|
768 if e.key == K_RIGHT: |
ec79aabe2bf1
Scroll game window with arrow keys.
Jeremy Thurgood <firxen@gmail.com>
parents:
37
diff
changeset
|
769 self.tvw.move_view(self.TILE_DIMENSIONS[0], 0) |
262
d508248041ff
avoid passing events in twice
Neil Muller <drnlmuller@gmail.com>
parents:
258
diff
changeset
|
770 return True |
d508248041ff
avoid passing events in twice
Neil Muller <drnlmuller@gmail.com>
parents:
258
diff
changeset
|
771 return False |
25
6d6ab0c1479d
Add placing some chickens and foxes
Neil Muller <drnlmuller@gmail.com>
parents:
24
diff
changeset
|
772 |
139
1d73de63bd71
Add basic game over screen
Neil Muller <drnlmuller@gmail.com>
parents:
135
diff
changeset
|
773 def advance_day(self): |
1d73de63bd71
Add basic game over screen
Neil Muller <drnlmuller@gmail.com>
parents:
135
diff
changeset
|
774 self.days += 1 |
392
bb75979b58e6
Move game_over logic from gameboard to level, for later reworking
Neil Muller <drnlmuller@gmail.com>
parents:
389
diff
changeset
|
775 if self.level.is_last_day(self.days): |
345
279974cc0698
Only set color of days left to red when there is only one day left.
Simon Cross <hodgestar@gmail.com>
parents:
341
diff
changeset
|
776 self.toolbar.day_counter.style.color = (255, 0, 0) |
346
6baf8b5beb5c
Remove the "constant" constant
Neil Muller <drnlmuller@gmail.com>
parents:
345
diff
changeset
|
777 self.toolbar.update_day_counter("%s/%s" % (self.days, |
392
bb75979b58e6
Move game_over logic from gameboard to level, for later reworking
Neil Muller <drnlmuller@gmail.com>
parents:
389
diff
changeset
|
778 self.level.get_max_turns())) |
139
1d73de63bd71
Add basic game over screen
Neil Muller <drnlmuller@gmail.com>
parents:
135
diff
changeset
|
779 |
25
6d6ab0c1479d
Add placing some chickens and foxes
Neil Muller <drnlmuller@gmail.com>
parents:
24
diff
changeset
|
780 def clear_foxes(self): |
116
d539ef5a3333
Add basic chicken->egg cycle
Neil Muller <drnlmuller@gmail.com>
parents:
115
diff
changeset
|
781 for fox in self.foxes.copy(): |
80
ad9d1bc7ef0c
Kill foxes that don't reach safety
Neil Muller <drnlmuller@gmail.com>
parents:
79
diff
changeset
|
782 # 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
|
783 # killed |
395
2d0ff46118e2
Basic support for z coordinate
Neil Muller <drnlmuller@gmail.com>
parents:
392
diff
changeset
|
784 if self.in_bounds(fox.pos) and \ |
2d0ff46118e2
Basic support for z coordinate
Neil Muller <drnlmuller@gmail.com>
parents:
392
diff
changeset
|
785 self.tv.get(fox.pos.to_tile_tuple()) != self.WOODLAND: |
84 | 786 self.kill_fox(fox) |
787 else: | |
397
532f1ea476ff
Make foxes enter buildings, with a seperate count for them
Neil Muller <drnlmuller@gmail.com>
parents:
396
diff
changeset
|
788 self.remove_fox(fox) |
116
d539ef5a3333
Add basic chicken->egg cycle
Neil Muller <drnlmuller@gmail.com>
parents:
115
diff
changeset
|
789 self.foxes = set() # Remove all the foxes |
25
6d6ab0c1479d
Add placing some chickens and foxes
Neil Muller <drnlmuller@gmail.com>
parents:
24
diff
changeset
|
790 |
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
|
791 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
|
792 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
|
793 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
|
794 |
202 | 795 def run_animations(self): |
380
1586eccdefe4
Ripped out legacy animation infrastructure in favour of layered sprites.
Jeremy Thurgood <firxen@gmail.com>
parents:
379
diff
changeset
|
796 # For legacy. |
292
bf271e857157
Clear tool when calling price dialog
Neil Muller <drnlmuller@gmail.com>
parents:
290
diff
changeset
|
797 if self.toolbar.anim_clear_tool: |
bf271e857157
Clear tool when calling price dialog
Neil Muller <drnlmuller@gmail.com>
parents:
290
diff
changeset
|
798 self.toolbar.clear_tool() |
202 | 799 |
396
19e583e5cdc0
Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents:
395
diff
changeset
|
800 def do_night_step(self): |
19e583e5cdc0
Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents:
395
diff
changeset
|
801 """Handle the events of the night. |
19e583e5cdc0
Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents:
395
diff
changeset
|
802 |
122
d2b19131d537
Don't continue the night if we're not doing anything anymore
Neil Muller <drnlmuller@gmail.com>
parents:
119
diff
changeset
|
803 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
|
804 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
|
805 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
|
806 return True |
396
19e583e5cdc0
Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents:
395
diff
changeset
|
807 # Move all the foxes |
19e583e5cdc0
Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents:
395
diff
changeset
|
808 over = self.foxes_move() |
19e583e5cdc0
Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents:
395
diff
changeset
|
809 if not over: |
19e583e5cdc0
Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents:
395
diff
changeset
|
810 self.foxes_attack() |
19e583e5cdc0
Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents:
395
diff
changeset
|
811 self.chickens_attack() |
19e583e5cdc0
Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents:
395
diff
changeset
|
812 return over |
19e583e5cdc0
Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents:
395
diff
changeset
|
813 |
401
7405f7db469f
Tweak fox attack logic - we no longer ignore chickens we accidently step on
Neil Muller <drnlmuller@gmail.com>
parents:
400
diff
changeset
|
814 def _cache_animal_positions(self): |
399
3294929223bd
Cache fox positions to avoid a repeated loop
Neil Muller <drnlmuller@gmail.com>
parents:
397
diff
changeset
|
815 """Cache the current set of fox positions for the avoiding checks""" |
3294929223bd
Cache fox positions to avoid a repeated loop
Neil Muller <drnlmuller@gmail.com>
parents:
397
diff
changeset
|
816 w, h = self.tv.size |
401
7405f7db469f
Tweak fox attack logic - we no longer ignore chickens we accidently step on
Neil Muller <drnlmuller@gmail.com>
parents:
400
diff
changeset
|
817 self._pos_cache['fox'] = [[[None for z in range(5)] for y in range(h)] |
399
3294929223bd
Cache fox positions to avoid a repeated loop
Neil Muller <drnlmuller@gmail.com>
parents:
397
diff
changeset
|
818 for x in range(w)] # NB: Assumes z in [0, 4] |
401
7405f7db469f
Tweak fox attack logic - we no longer ignore chickens we accidently step on
Neil Muller <drnlmuller@gmail.com>
parents:
400
diff
changeset
|
819 self._pos_cache['chicken'] = [[[None for z in range(5)] for y in range(h)] |
7405f7db469f
Tweak fox attack logic - we no longer ignore chickens we accidently step on
Neil Muller <drnlmuller@gmail.com>
parents:
400
diff
changeset
|
820 for x in range(w)] |
399
3294929223bd
Cache fox positions to avoid a repeated loop
Neil Muller <drnlmuller@gmail.com>
parents:
397
diff
changeset
|
821 for fox in self.foxes: |
401
7405f7db469f
Tweak fox attack logic - we no longer ignore chickens we accidently step on
Neil Muller <drnlmuller@gmail.com>
parents:
400
diff
changeset
|
822 self._add_to_pos_cache(fox, 'fox') |
7405f7db469f
Tweak fox attack logic - we no longer ignore chickens we accidently step on
Neil Muller <drnlmuller@gmail.com>
parents:
400
diff
changeset
|
823 for chick in self.chickens: |
7405f7db469f
Tweak fox attack logic - we no longer ignore chickens we accidently step on
Neil Muller <drnlmuller@gmail.com>
parents:
400
diff
changeset
|
824 self._add_to_pos_cache(chick, 'chicken') |
7405f7db469f
Tweak fox attack logic - we no longer ignore chickens we accidently step on
Neil Muller <drnlmuller@gmail.com>
parents:
400
diff
changeset
|
825 |
7405f7db469f
Tweak fox attack logic - we no longer ignore chickens we accidently step on
Neil Muller <drnlmuller@gmail.com>
parents:
400
diff
changeset
|
826 def _add_to_pos_cache(self, animal, cache_type): |
425
1d0cc37b4e14
Add method for clearing all chickens (will be useful later). Cache animal positions only just before night starts. Range-check position before adding it to the cache.
Simon Cross <hodgestar@gmail.com>
parents:
424
diff
changeset
|
827 if self.in_bounds(animal.pos): |
1d0cc37b4e14
Add method for clearing all chickens (will be useful later). Cache animal positions only just before night starts. Range-check position before adding it to the cache.
Simon Cross <hodgestar@gmail.com>
parents:
424
diff
changeset
|
828 self._pos_cache[cache_type][animal.pos.x][animal.pos.y][animal.pos.z] = animal |
399
3294929223bd
Cache fox positions to avoid a repeated loop
Neil Muller <drnlmuller@gmail.com>
parents:
397
diff
changeset
|
829 |
401
7405f7db469f
Tweak fox attack logic - we no longer ignore chickens we accidently step on
Neil Muller <drnlmuller@gmail.com>
parents:
400
diff
changeset
|
830 def _update_pos_cache(self, old_pos, animal, cache_type): |
405
ae3cee7a1337
Fix crash due to invalid cache
Neil Muller <drnlmuller@gmail.com>
parents:
403
diff
changeset
|
831 if self.in_bounds(old_pos) and self._pos_cache[cache_type]: |
401
7405f7db469f
Tweak fox attack logic - we no longer ignore chickens we accidently step on
Neil Muller <drnlmuller@gmail.com>
parents:
400
diff
changeset
|
832 self._pos_cache[cache_type][old_pos.x][old_pos.y][old_pos.z] = None |
7405f7db469f
Tweak fox attack logic - we no longer ignore chickens we accidently step on
Neil Muller <drnlmuller@gmail.com>
parents:
400
diff
changeset
|
833 if animal: |
7405f7db469f
Tweak fox attack logic - we no longer ignore chickens we accidently step on
Neil Muller <drnlmuller@gmail.com>
parents:
400
diff
changeset
|
834 pos = animal.pos |
7405f7db469f
Tweak fox attack logic - we no longer ignore chickens we accidently step on
Neil Muller <drnlmuller@gmail.com>
parents:
400
diff
changeset
|
835 if self.in_bounds(pos): |
7405f7db469f
Tweak fox attack logic - we no longer ignore chickens we accidently step on
Neil Muller <drnlmuller@gmail.com>
parents:
400
diff
changeset
|
836 self._pos_cache[cache_type][pos.x][pos.y][pos.z] = animal |
399
3294929223bd
Cache fox positions to avoid a repeated loop
Neil Muller <drnlmuller@gmail.com>
parents:
397
diff
changeset
|
837 |
401
7405f7db469f
Tweak fox attack logic - we no longer ignore chickens we accidently step on
Neil Muller <drnlmuller@gmail.com>
parents:
400
diff
changeset
|
838 def get_animal_at_pos(self, pos, cache_type): |
7405f7db469f
Tweak fox attack logic - we no longer ignore chickens we accidently step on
Neil Muller <drnlmuller@gmail.com>
parents:
400
diff
changeset
|
839 if not self._pos_cache[cache_type]: |
7405f7db469f
Tweak fox attack logic - we no longer ignore chickens we accidently step on
Neil Muller <drnlmuller@gmail.com>
parents:
400
diff
changeset
|
840 return None # We don't maintain the cache during the day |
399
3294929223bd
Cache fox positions to avoid a repeated loop
Neil Muller <drnlmuller@gmail.com>
parents:
397
diff
changeset
|
841 if self.in_bounds(pos): |
401
7405f7db469f
Tweak fox attack logic - we no longer ignore chickens we accidently step on
Neil Muller <drnlmuller@gmail.com>
parents:
400
diff
changeset
|
842 return self._pos_cache[cache_type][pos.x][pos.y][pos.z] |
7405f7db469f
Tweak fox attack logic - we no longer ignore chickens we accidently step on
Neil Muller <drnlmuller@gmail.com>
parents:
400
diff
changeset
|
843 return None |
399
3294929223bd
Cache fox positions to avoid a repeated loop
Neil Muller <drnlmuller@gmail.com>
parents:
397
diff
changeset
|
844 |
422
ab4fc3fe0f96
chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
421
diff
changeset
|
845 def chickens_scatter(self): |
ab4fc3fe0f96
chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
421
diff
changeset
|
846 """Chickens outside move around randomly a bit""" |
ab4fc3fe0f96
chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
421
diff
changeset
|
847 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
|
848 old_pos = chicken.pos |
ab4fc3fe0f96
chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
421
diff
changeset
|
849 chicken.move(self) |
ab4fc3fe0f96
chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
421
diff
changeset
|
850 if chicken.pos != old_pos: |
ab4fc3fe0f96
chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
421
diff
changeset
|
851 self._update_pos_cache(old_pos, chicken, 'chicken') |
ab4fc3fe0f96
chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
421
diff
changeset
|
852 |
ab4fc3fe0f96
chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
421
diff
changeset
|
853 def chickens_chop_wood(self): |
ab4fc3fe0f96
chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
421
diff
changeset
|
854 """Chickens with axes chop down trees near them""" |
ab4fc3fe0f96
chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
421
diff
changeset
|
855 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
|
856 chicken.chop(self) |
ab4fc3fe0f96
chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
421
diff
changeset
|
857 |
396
19e583e5cdc0
Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents:
395
diff
changeset
|
858 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
|
859 over = True |
29 | 860 for fox in self.foxes: |
399
3294929223bd
Cache fox positions to avoid a repeated loop
Neil Muller <drnlmuller@gmail.com>
parents:
397
diff
changeset
|
861 old_pos = fox.pos |
29 | 862 fox.move(self) |
122
d2b19131d537
Don't continue the night if we're not doing anything anymore
Neil Muller <drnlmuller@gmail.com>
parents:
119
diff
changeset
|
863 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
|
864 over = False |
399
3294929223bd
Cache fox positions to avoid a repeated loop
Neil Muller <drnlmuller@gmail.com>
parents:
397
diff
changeset
|
865 if fox.pos != old_pos: |
401
7405f7db469f
Tweak fox attack logic - we no longer ignore chickens we accidently step on
Neil Muller <drnlmuller@gmail.com>
parents:
400
diff
changeset
|
866 self._update_pos_cache(old_pos, fox, 'fox') |
396
19e583e5cdc0
Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents:
395
diff
changeset
|
867 return over |
19e583e5cdc0
Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents:
395
diff
changeset
|
868 |
19e583e5cdc0
Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents:
395
diff
changeset
|
869 def foxes_attack(self): |
19e583e5cdc0
Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents:
395
diff
changeset
|
870 for fox in self.foxes: |
19e583e5cdc0
Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents:
395
diff
changeset
|
871 fox.attack(self) |
19e583e5cdc0
Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents:
395
diff
changeset
|
872 |
19e583e5cdc0
Refactor for further move work
Neil Muller <drnlmuller@gmail.com>
parents:
395
diff
changeset
|
873 def chickens_attack(self): |
84 | 874 for chicken in self.chickens: |
875 chicken.attack(self) | |
29 | 876 |
25
6d6ab0c1479d
Add placing some chickens and foxes
Neil Muller <drnlmuller@gmail.com>
parents:
24
diff
changeset
|
877 def add_chicken(self, chicken): |
116
d539ef5a3333
Add basic chicken->egg cycle
Neil Muller <drnlmuller@gmail.com>
parents:
115
diff
changeset
|
878 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
|
879 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
|
880 self.tv.sprites.append(chicken) |
424
fbef17cab632
Use fully rendered map in gameboard choosing screen
Neil Muller <drnlmuller@gmail.com>
parents:
422
diff
changeset
|
881 if self.disp: |
fbef17cab632
Use fully rendered map in gameboard choosing screen
Neil Muller <drnlmuller@gmail.com>
parents:
422
diff
changeset
|
882 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
|
883 |
6d6ab0c1479d
Add placing some chickens and foxes
Neil Muller <drnlmuller@gmail.com>
parents:
24
diff
changeset
|
884 def add_fox(self, fox): |
116
d539ef5a3333
Add basic chicken->egg cycle
Neil Muller <drnlmuller@gmail.com>
parents:
115
diff
changeset
|
885 self.foxes.add(fox) |
25
6d6ab0c1479d
Add placing some chickens and foxes
Neil Muller <drnlmuller@gmail.com>
parents:
24
diff
changeset
|
886 self.tv.sprites.append(fox) |
29 | 887 |
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
|
888 def add_building(self, building): |
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
|
889 self.buildings.append(building) |
381
7a58dadfd251
little cleanups, every sprite in its proper layer.
Jeremy Thurgood <firxen@gmail.com>
parents:
380
diff
changeset
|
890 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
|
891 |
419
d110d55c8449
Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents:
414
diff
changeset
|
892 def place_hatched_chicken(self, new_chick, building): |
d110d55c8449
Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents:
414
diff
changeset
|
893 try: |
d110d55c8449
Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents:
414
diff
changeset
|
894 building.add_occupant(new_chick) |
d110d55c8449
Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents:
414
diff
changeset
|
895 self.add_chicken(new_chick) |
d110d55c8449
Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents:
414
diff
changeset
|
896 new_chick.equip(equipment.Nest()) |
d110d55c8449
Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents:
414
diff
changeset
|
897 except buildings.BuildingFullError: |
d110d55c8449
Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents:
414
diff
changeset
|
898 # No space in the hen house, look nearby |
d110d55c8449
Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents:
414
diff
changeset
|
899 for tile_pos in building.adjacent_tiles(): |
d110d55c8449
Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents:
414
diff
changeset
|
900 if self.tv.get(tile_pos) != self.GRASSLAND: |
d110d55c8449
Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents:
414
diff
changeset
|
901 continue |
d110d55c8449
Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents:
414
diff
changeset
|
902 if self.get_outside_chicken(tile_pos) is None: |
d110d55c8449
Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents:
414
diff
changeset
|
903 self.add_chicken(new_chick) |
d110d55c8449
Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents:
414
diff
changeset
|
904 self.relocate_animal(new_chick, tile_pos=tile_pos) |
d110d55c8449
Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents:
414
diff
changeset
|
905 break |
d110d55c8449
Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents:
414
diff
changeset
|
906 # if there isn't a space for the |
d110d55c8449
Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents:
414
diff
changeset
|
907 # new chick it dies. :/ Farm life |
d110d55c8449
Move hatching logic into chickens.
Jeremy Thurgood <firxen@gmail.com>
parents:
414
diff
changeset
|
908 # is cruel. |
116
d539ef5a3333
Add basic chicken->egg cycle
Neil Muller <drnlmuller@gmail.com>
parents:
115
diff
changeset
|
909 |
84 | 910 def kill_fox(self, fox): |
251
844bfb23d4b6
Refactored animal death and added death animations.
Jeremy Thurgood <firxen@gmail.com>
parents:
247
diff
changeset
|
911 self.killed_foxes += 1 |
844bfb23d4b6
Refactored animal death and added death animations.
Jeremy Thurgood <firxen@gmail.com>
parents:
247
diff
changeset
|
912 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
|
913 self.add_cash(self.level.sell_price_dead_fox) |
401
7405f7db469f
Tweak fox attack logic - we no longer ignore chickens we accidently step on
Neil Muller <drnlmuller@gmail.com>
parents:
400
diff
changeset
|
914 self._update_pos_cache(fox.pos, None, 'fox') |
251
844bfb23d4b6
Refactored animal death and added death animations.
Jeremy Thurgood <firxen@gmail.com>
parents:
247
diff
changeset
|
915 self.remove_fox(fox) |
84 | 916 |
29 | 917 def remove_fox(self, fox): |
116
d539ef5a3333
Add basic chicken->egg cycle
Neil Muller <drnlmuller@gmail.com>
parents:
115
diff
changeset
|
918 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
|
919 if fox.building: |
532f1ea476ff
Make foxes enter buildings, with a seperate count for them
Neil Muller <drnlmuller@gmail.com>
parents:
396
diff
changeset
|
920 fox.building.remove_predator(fox) |
116
d539ef5a3333
Add basic chicken->egg cycle
Neil Muller <drnlmuller@gmail.com>
parents:
115
diff
changeset
|
921 if fox in self.tv.sprites: |
29 | 922 self.tv.sprites.remove(fox) |
923 | |
924 def remove_chicken(self, chick): | |
215
85a5299caf4a
bugfix: deselect eaten chickens
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
213
diff
changeset
|
925 if chick is self.animal_to_place: |
85a5299caf4a
bugfix: deselect eaten chickens
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
213
diff
changeset
|
926 self.select_animal_to_place(None) |
116
d539ef5a3333
Add basic chicken->egg cycle
Neil Muller <drnlmuller@gmail.com>
parents:
115
diff
changeset
|
927 self.chickens.discard(chick) |
243
4f86c2616cdf
Variable number of eggs for chickens
Neil Muller <drnlmuller@gmail.com>
parents:
241
diff
changeset
|
928 self.eggs -= chick.get_num_eggs() |
4f86c2616cdf
Variable number of eggs for chickens
Neil Muller <drnlmuller@gmail.com>
parents:
241
diff
changeset
|
929 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
|
930 if chick.abode: |
125 | 931 chick.abode.clear_occupant() |
116
d539ef5a3333
Add basic chicken->egg cycle
Neil Muller <drnlmuller@gmail.com>
parents:
115
diff
changeset
|
932 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
|
933 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
|
934 self.tv.sprites.remove(chick) |
401
7405f7db469f
Tweak fox attack logic - we no longer ignore chickens we accidently step on
Neil Muller <drnlmuller@gmail.com>
parents:
400
diff
changeset
|
935 self._update_pos_cache(chick.pos, None, 'chicken') |
40
678421bd58ee
Money counter with very ugly display hack.
Jeremy Thurgood <firxen@gmail.com>
parents:
39
diff
changeset
|
936 |
65
7e9c8ad06d32
Implement building selling.
Simon Cross <hodgestar@gmail.com>
parents:
64
diff
changeset
|
937 def remove_building(self, building): |
7e9c8ad06d32
Implement building selling.
Simon Cross <hodgestar@gmail.com>
parents:
64
diff
changeset
|
938 if building in self.buildings: |
7e9c8ad06d32
Implement building selling.
Simon Cross <hodgestar@gmail.com>
parents:
64
diff
changeset
|
939 self.buildings.remove(building) |
381
7a58dadfd251
little cleanups, every sprite in its proper layer.
Jeremy Thurgood <firxen@gmail.com>
parents:
380
diff
changeset
|
940 self.tv.sprites.remove(building, layer='buildings') |
65
7e9c8ad06d32
Implement building selling.
Simon Cross <hodgestar@gmail.com>
parents:
64
diff
changeset
|
941 |
40
678421bd58ee
Money counter with very ugly display hack.
Jeremy Thurgood <firxen@gmail.com>
parents:
39
diff
changeset
|
942 def add_cash(self, amount): |
678421bd58ee
Money counter with very ugly display hack.
Jeremy Thurgood <firxen@gmail.com>
parents:
39
diff
changeset
|
943 self.cash += amount |
678421bd58ee
Money counter with very ugly display hack.
Jeremy Thurgood <firxen@gmail.com>
parents:
39
diff
changeset
|
944 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
|
945 |
422
ab4fc3fe0f96
chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
421
diff
changeset
|
946 def add_wood(self, planks): |
ab4fc3fe0f96
chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
421
diff
changeset
|
947 self.wood += planks |
ab4fc3fe0f96
chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
421
diff
changeset
|
948 self.toolbar.update_wood_counter(self.wood) |
ab4fc3fe0f96
chickens scatter; chop wood
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
421
diff
changeset
|
949 |
408
02a6de5629d6
Levels can include starting equipment
Neil Muller <drnlmuller@gmail.com>
parents:
405
diff
changeset
|
950 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
|
951 """Add chickens as specified by the code layer""" |
e89e6ad011ac
Use code layer to place chickens
Neil Muller <drnlmuller@gmail.com>
parents:
381
diff
changeset
|
952 chick = animal.Chicken((tile.tx, tile.ty)) |
408
02a6de5629d6
Levels can include starting equipment
Neil Muller <drnlmuller@gmail.com>
parents:
405
diff
changeset
|
953 for equip_cls in equipment.EQUIP_MAP[value]: |
02a6de5629d6
Levels can include starting equipment
Neil Muller <drnlmuller@gmail.com>
parents:
405
diff
changeset
|
954 item = equip_cls() |
02a6de5629d6
Levels can include starting equipment
Neil Muller <drnlmuller@gmail.com>
parents:
405
diff
changeset
|
955 chick.equip(item) |
382
e89e6ad011ac
Use code layer to place chickens
Neil Muller <drnlmuller@gmail.com>
parents:
381
diff
changeset
|
956 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
|
957 |
241
1a7000c8211c
Demolition foxes, including better fox selection.
Jeremy Thurgood <firxen@gmail.com>
parents:
239
diff
changeset
|
958 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
|
959 fox_cls = misc.WeightedSelection(self.level.fox_weightings).choose() |
241
1a7000c8211c
Demolition foxes, including better fox selection.
Jeremy Thurgood <firxen@gmail.com>
parents:
239
diff
changeset
|
960 return fox_cls((x, y)) |
1a7000c8211c
Demolition foxes, including better fox selection.
Jeremy Thurgood <firxen@gmail.com>
parents:
239
diff
changeset
|
961 |
69
18db99fda6bd
Move spawing code from engine to gameboard - seems more natural.
Neil Muller <drnlmuller@gmail.com>
parents:
68
diff
changeset
|
962 def spawn_foxes(self): |
18db99fda6bd
Move spawing code from engine to gameboard - seems more natural.
Neil Muller <drnlmuller@gmail.com>
parents:
68
diff
changeset
|
963 """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
|
964 # 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
|
965 x, y = 0, 0 |
18db99fda6bd
Move spawing code from engine to gameboard - seems more natural.
Neil Muller <drnlmuller@gmail.com>
parents:
68
diff
changeset
|
966 width, height = self.tv.size |
389
463802281182
Add basic level support (level choosing needs work)
Neil Muller <drnlmuller@gmail.com>
parents:
382
diff
changeset
|
967 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
|
968 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
|
969 while len(self.foxes) < new_foxes: |
73
f3ce3346e25e
Spawn foxes jsut outside the map
Neil Muller <drnlmuller@gmail.com>
parents:
69
diff
changeset
|
970 side = random.randint(0, 3) |
f3ce3346e25e
Spawn foxes jsut outside the map
Neil Muller <drnlmuller@gmail.com>
parents:
69
diff
changeset
|
971 if side == 0: |
f3ce3346e25e
Spawn foxes jsut outside the map
Neil Muller <drnlmuller@gmail.com>
parents:
69
diff
changeset
|
972 # top |
f3ce3346e25e
Spawn foxes jsut outside the map
Neil Muller <drnlmuller@gmail.com>
parents:
69
diff
changeset
|
973 y = -1 |
f3ce3346e25e
Spawn foxes jsut outside the map
Neil Muller <drnlmuller@gmail.com>
parents:
69
diff
changeset
|
974 x = random.randint(-1, width) |
f3ce3346e25e
Spawn foxes jsut outside the map
Neil Muller <drnlmuller@gmail.com>
parents:
69
diff
changeset
|
975 elif side == 1: |
f3ce3346e25e
Spawn foxes jsut outside the map
Neil Muller <drnlmuller@gmail.com>
parents:
69
diff
changeset
|
976 # bottom |
f3ce3346e25e
Spawn foxes jsut outside the map
Neil Muller <drnlmuller@gmail.com>
parents:
69
diff
changeset
|
977 y = height |
f3ce3346e25e
Spawn foxes jsut outside the map
Neil Muller <drnlmuller@gmail.com>
parents:
69
diff
changeset
|
978 x = random.randint(-1, width) |
f3ce3346e25e
Spawn foxes jsut outside the map
Neil Muller <drnlmuller@gmail.com>
parents:
69
diff
changeset
|
979 elif side == 2: |
f3ce3346e25e
Spawn foxes jsut outside the map
Neil Muller <drnlmuller@gmail.com>
parents:
69
diff
changeset
|
980 # left |
f3ce3346e25e
Spawn foxes jsut outside the map
Neil Muller <drnlmuller@gmail.com>
parents:
69
diff
changeset
|
981 x = -1 |
f3ce3346e25e
Spawn foxes jsut outside the map
Neil Muller <drnlmuller@gmail.com>
parents:
69
diff
changeset
|
982 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
|
983 else: |
73
f3ce3346e25e
Spawn foxes jsut outside the map
Neil Muller <drnlmuller@gmail.com>
parents:
69
diff
changeset
|
984 x = width |
f3ce3346e25e
Spawn foxes jsut outside the map
Neil Muller <drnlmuller@gmail.com>
parents:
69
diff
changeset
|
985 y = random.randint(-1, height) |
403
c7cfa230f5d4
Remove board size restriction on number of foxes
Neil Muller <drnlmuller@gmail.com>
parents:
401
diff
changeset
|
986 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
|
987 |
67
9171d9b9ab35
Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents:
66
diff
changeset
|
988 def fix_buildings(self): |
9171d9b9ab35
Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents:
66
diff
changeset
|
989 """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
|
990 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
|
991 |
9171d9b9ab35
Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents:
66
diff
changeset
|
992 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
|
993 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
|
994 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
|
995 |
9171d9b9ab35
Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents:
66
diff
changeset
|
996 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
|
997 """ |
9171d9b9ab35
Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents:
66
diff
changeset
|
998 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
|
999 |
9171d9b9ab35
Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents:
66
diff
changeset
|
1000 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
|
1001 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
|
1002 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
|
1003 tile_pos = (x, y) |
9171d9b9ab35
Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents:
66
diff
changeset
|
1004 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
|
1005 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
|
1006 continue |
9171d9b9ab35
Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents:
66
diff
changeset
|
1007 |
9171d9b9ab35
Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents:
66
diff
changeset
|
1008 covered = False |
9171d9b9ab35
Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents:
66
diff
changeset
|
1009 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
|
1010 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
|
1011 covered = True |
9171d9b9ab35
Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents:
66
diff
changeset
|
1012 break |
9171d9b9ab35
Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents:
66
diff
changeset
|
1013 |
9171d9b9ab35
Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents:
66
diff
changeset
|
1014 if covered: |
9171d9b9ab35
Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents:
66
diff
changeset
|
1015 continue |
9171d9b9ab35
Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents:
66
diff
changeset
|
1016 |
9171d9b9ab35
Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents:
66
diff
changeset
|
1017 building_cls = tile_to_building[tile_no] |
9171d9b9ab35
Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents:
66
diff
changeset
|
1018 building = building_cls(tile_pos) |
9171d9b9ab35
Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents:
66
diff
changeset
|
1019 building.remove(self.tv) |
9171d9b9ab35
Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents:
66
diff
changeset
|
1020 building.place(self.tv) |
9171d9b9ab35
Sanity check and fix up buildings on map after loading.
Simon Cross <hodgestar@gmail.com>
parents:
66
diff
changeset
|
1021 self.add_building(building) |
139
1d73de63bd71
Add basic game over screen
Neil Muller <drnlmuller@gmail.com>
parents:
135
diff
changeset
|
1022 |
307
bf1df0902883
three game modes: fortnight, quarter, fox extinction
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
305
diff
changeset
|
1023 def trees_left(self): |
bf1df0902883
three game modes: fortnight, quarter, fox extinction
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
305
diff
changeset
|
1024 width, height = self.tv.size |
bf1df0902883
three game modes: fortnight, quarter, fox extinction
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
305
diff
changeset
|
1025 return len([(x,y) for x in range(width) for y in range(height) if self.tv.get((x,y)) == self.WOODLAND]) |
bf1df0902883
three game modes: fortnight, quarter, fox extinction
Adrianna Pińska <adrianna.pinska@gmail.com>
parents:
305
diff
changeset
|
1026 |
326
89f51d513606
Add TextDialog class and use it to warn about selling your last chicken.
Simon Cross <hodgestar@gmail.com>
parents:
325
diff
changeset
|
1027 |
89f51d513606
Add TextDialog class and use it to warn about selling your last chicken.
Simon Cross <hodgestar@gmail.com>
parents:
325
diff
changeset
|
1028 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
|
1029 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
|
1030 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
|
1031 |
89f51d513606
Add TextDialog class and use it to warn about selling your last chicken.
Simon Cross <hodgestar@gmail.com>
parents:
325
diff
changeset
|
1032 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
|
1033 |
89f51d513606
Add TextDialog class and use it to warn about selling your last chicken.
Simon Cross <hodgestar@gmail.com>
parents:
325
diff
changeset
|
1034 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
|
1035 |
89f51d513606
Add TextDialog class and use it to warn about selling your last chicken.
Simon Cross <hodgestar@gmail.com>
parents:
325
diff
changeset
|
1036 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
|
1037 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
|
1038 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
|
1039 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
|
1040 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
|
1041 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
|
1042 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
|
1043 |
89f51d513606
Add TextDialog class and use it to warn about selling your last chicken.
Simon Cross <hodgestar@gmail.com>
parents:
325
diff
changeset
|
1044 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
|
1045 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
|
1046 |
89f51d513606
Add TextDialog class and use it to warn about selling your last chicken.
Simon Cross <hodgestar@gmail.com>
parents:
325
diff
changeset
|
1047 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
|
1048 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
|
1049 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
|
1050 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
|
1051 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
|
1052 |
89f51d513606
Add TextDialog class and use it to warn about selling your last chicken.
Simon Cross <hodgestar@gmail.com>
parents:
325
diff
changeset
|
1053 gui.Dialog.__init__(self, title_label, tbl, **params) |
336 | 1054 |
1055 |