rinkhals: gamelib/gameboard.py annotate

annotate gamelib/gameboard.py @ 298:88a626202591

Buy equipment for chickens in buildings

author	Neil Muller <drnlmuller@gmail.com>
date	Sat, 05 Sep 2009 16:42:32 +0000
parents	29e9683055dc
children	01c1682dc250

rev	line source
69 18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	1 import random
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	2
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	3 import pygame
262 d508248041ff avoid passing events in twice Neil Muller <drnlmuller@gmail.com> parents: 258 diff changeset	4 from pygame.locals import MOUSEBUTTONDOWN, MOUSEMOTION, KEYDOWN, K_UP, K_DOWN, \
d508248041ff avoid passing events in twice Neil Muller <drnlmuller@gmail.com> parents: 258 diff changeset	5 K_LEFT, K_RIGHT
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	6 from pgu import gui
9 3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	7
3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	8 import data
24 7584453f4944 Add support for PNG tiles. Simon Cross <hodgestar@gmail.com> parents: 17 diff changeset	9 import tiles
79 8241386a1651 Add chicken counter Neil Muller <drnlmuller@gmail.com> parents: 77 diff changeset	10 import icons
40 678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	11 import constants
57 08665fa60345 Implement henhouses and henhouse adding. Simon Cross <hodgestar@gmail.com> parents: 54 diff changeset	12 import buildings
69 18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	13 import animal
84 5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	14 import equipment
94 fa8d8fc1bf5b Added some sounds David Fraser <davidf@sjsoft.com> parents: 92 diff changeset	15 import sound
162 fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	16 import cursors
186 f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	17 import sprite_cursor
241 1a7000c8211c Demolition foxes, including better fox selection. Jeremy Thurgood <firxen@gmail.com> parents: 239 diff changeset	18 import misc
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	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 1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	21 def __init__(self, value, **params):
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	22 gui.Label.__init__(self, value, **params)
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	23 if 'width' in params:
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	24 self._width = params['width']
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	25 if 'height' in params:
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	26 self._height = params['height']
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	27 self._set_size()
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	28
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	29 def _set_size(self):
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	30 width, height = self.font.size(self.value)
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	31 width = getattr(self, '_width', width)
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	32 height = getattr(self, '_height', height)
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	33 self.style.width, self.style.height = width, height
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	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 1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	37 if self.style.align > 0:
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	38 r = s.get_rect()
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	39 w, _ = self.font.size(self.value)
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	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 1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	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 1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	48 def mklabel(text="", **params):
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	49 params.setdefault('color', constants.FG_COLOR)
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	50 params.setdefault('width', GameBoard.TOOLBAR_WIDTH/2)
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	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 1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	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 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	59 class ToolBar(gui.Table):
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	60 def __init__(self, gameboard, **params):
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	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 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	64 self.gameboard = gameboard
168 1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	65 self.cash_counter = mklabel(align=1)
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	66 self.chicken_counter = mklabel(align=1)
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	67 self.egg_counter = mklabel(align=1)
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	68 self.day_counter = mklabel(align=1)
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	69 self.killed_foxes = mklabel(align=1)
83 9bd2c22e1746 Cleaned up some toolbar code a bit. Jeremy Thurgood <firxen@gmail.com> parents: 80 diff changeset	70
168 1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	71 self.tr()
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	72 self.td(gui.Spacer(self.rect.w/2, 0))
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	73 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	74 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	75 self.add_counter(mklabel("Groats:"), self.cash_counter)
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	76 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	77 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	78 self.add_counter(icons.KILLED_FOX, self.killed_foxes)
289 37d88a9fc097 Tweak toolbar spacing Neil Muller <drnlmuller@gmail.com> parents: 288 diff changeset	79 self.add_spacer(15)
154 3afdefacb07f Neaten up toolbar. Simon Cross <hodgestar@gmail.com> parents: 153 diff changeset	80
162 fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	81 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	82 None, cursors.cursors['select'])
31f5033eac70 Add prices to all tools where is makes sense to do so. Simon Cross <hodgestar@gmail.com> parents: 264 diff changeset	83 self.add_tool_button("Cut Trees", constants.TOOL_LOGGING,
272 cade64404997 Use (wrecking) ball for smashing down trees. Simon Cross <hodgestar@gmail.com> parents: 270 diff changeset	84 constants.LOGGING_PRICE, cursors.cursors['ball'])
289 37d88a9fc097 Tweak toolbar spacing Neil Muller <drnlmuller@gmail.com> parents: 288 diff changeset	85 self.add_spacer(15)
83 9bd2c22e1746 Cleaned up some toolbar code a bit. Jeremy Thurgood <firxen@gmail.com> parents: 80 diff changeset	86
154 3afdefacb07f Neaten up toolbar. Simon Cross <hodgestar@gmail.com> parents: 153 diff changeset	87 self.add_heading("Sell ...")
162 fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	88 self.add_tool_button("Chicken", constants.TOOL_SELL_CHICKEN,
270 31f5033eac70 Add prices to all tools where is makes sense to do so. Simon Cross <hodgestar@gmail.com> parents: 264 diff changeset	89 constants.SELL_PRICE_CHICKEN, cursors.cursors['sell'])
162 fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	90 self.add_tool_button("Egg", constants.TOOL_SELL_EGG,
270 31f5033eac70 Add prices to all tools where is makes sense to do so. Simon Cross <hodgestar@gmail.com> parents: 264 diff changeset	91 constants.SELL_PRICE_EGG, cursors.cursors['sell'])
162 fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	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'])
289 37d88a9fc097 Tweak toolbar spacing Neil Muller <drnlmuller@gmail.com> parents: 288 diff changeset	96 self.add_spacer(15)
154 3afdefacb07f Neaten up toolbar. Simon Cross <hodgestar@gmail.com> parents: 153 diff changeset	97
3afdefacb07f Neaten up toolbar. Simon Cross <hodgestar@gmail.com> parents: 153 diff changeset	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
31f5033eac70 Add prices to all tools where is makes sense to do so. Simon Cross <hodgestar@gmail.com> parents: 264 diff changeset	100 self.add_tool_button("Fence", constants.TOOL_BUY_FENCE,
31f5033eac70 Add prices to all tools where is makes sense to do so. Simon Cross <hodgestar@gmail.com> parents: 264 diff changeset	101 "%s/%s" % (constants.BUY_PRICE_FENCE,
31f5033eac70 Add prices to all tools where is makes sense to do so. Simon Cross <hodgestar@gmail.com> parents: 264 diff changeset	102 constants.REPAIR_PRICE_FENCE))
31f5033eac70 Add prices to all tools where is makes sense to do so. Simon Cross <hodgestar@gmail.com> parents: 264 diff changeset	103
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	104 for building_cls in buildings.BUILDINGS:
162 fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	105 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	106 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	107
109 48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	108 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	109 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	110 equipment_cls,
31f5033eac70 Add prices to all tools where is makes sense to do so. Simon Cross <hodgestar@gmail.com> parents: 264 diff changeset	111 equipment_cls.BUY_PRICE,
247 5b9cd693fe7c Add sprite cursors for equipment buying. Simon Cross <hodgestar@gmail.com> parents: 245 diff changeset	112 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	113
289 37d88a9fc097 Tweak toolbar spacing Neil Muller <drnlmuller@gmail.com> parents: 288 diff changeset	114 self.add_spacer(10)
286 49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	115 self.add_tool("Price Reference", self.show_prices)
289 37d88a9fc097 Tweak toolbar spacing Neil Muller <drnlmuller@gmail.com> parents: 288 diff changeset	116 self.add_spacer(20)
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	117
245 634491bf37e8 Change toolbar to gui.Toolbar -- gives nicer highlighting. Simon Cross <hodgestar@gmail.com> parents: 243 diff changeset	118 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	119
292 bf271e857157 Clear tool when calling price dialog Neil Muller <drnlmuller@gmail.com> parents: 290 diff changeset	120 self.anim_clear_tool = False # Flag to clear the tool on an anim loop
294 29e9683055dc Explain horrible hack Neil Muller <drnlmuller@gmail.com> parents: 292 diff changeset	121 # pgu's tool widget fiddling happens after the tool action, so calling
29e9683055dc Explain horrible hack Neil Muller <drnlmuller@gmail.com> parents: 292 diff changeset	122 # clear_tool in the tool's action doesn't work, so we punt it to
29e9683055dc Explain horrible hack Neil Muller <drnlmuller@gmail.com> parents: 292 diff changeset	123 # the anim loop
292 bf271e857157 Clear tool when calling price dialog Neil Muller <drnlmuller@gmail.com> parents: 290 diff changeset	124
68 6b8ac424da83 Add button for finishing day. Remove debugging print. Simon Cross <hodgestar@gmail.com> parents: 67 diff changeset	125 def day_done(self):
6b8ac424da83 Add button for finishing day. Remove debugging print. Simon Cross <hodgestar@gmail.com> parents: 67 diff changeset	126 import engine
6b8ac424da83 Add button for finishing day. Remove debugging print. Simon Cross <hodgestar@gmail.com> parents: 67 diff changeset	127 pygame.event.post(engine.START_NIGHT)
6b8ac424da83 Add button for finishing day. Remove debugging print. Simon Cross <hodgestar@gmail.com> parents: 67 diff changeset	128
286 49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	129 def show_prices(self):
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	130 """Popup dialog of prices"""
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	131 def make_box(text):
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	132 style = {
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	133 'border' : 1
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	134 }
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	135 word = gui.Label(text, style=style)
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	136 return word
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	137
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	138 def fix_widths(doc):
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	139 """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	140 width of the labels to max + 10"""
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	141 # 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	142 max_width = 0
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	143 for thing in doc.widgets:
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	144 if hasattr(thing, 'style'):
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	145 # A label
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	146 if thing.style.width > max_width:
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	147 max_width = thing.style.width
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	148 for thing in doc.widgets:
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	149 if hasattr(thing, 'style'):
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	150 thing.style.width = max_width + 10
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	151
287 21b0c4a99c0a Add close button to price dialog Neil Muller <drnlmuller@gmail.com> parents: 286 diff changeset	152 tbl = gui.Table()
21b0c4a99c0a Add close button to price dialog Neil Muller <drnlmuller@gmail.com> parents: 286 diff changeset	153 tbl.tr()
286 49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	154 doc = gui.Document(width=400)
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	155 space = doc.style.font.size(" ")
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	156 for header in ['Item', 'Buy Price', 'Sell Price']:
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	157 doc.add(make_box(header))
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	158 doc.br(space[1])
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	159 for building in buildings.BUILDINGS:
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	160 doc.add(make_box(building.NAME))
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	161 doc.add(make_box('%d' % building.BUY_PRICE))
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	162 doc.add(make_box('%d' % building.SELL_PRICE))
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	163 doc.br(space[1])
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	164 for equip in equipment.EQUIPMENT:
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	165 doc.add(make_box(equip.NAME))
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	166 doc.add(make_box('%d' % equip.BUY_PRICE))
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	167 doc.add(make_box('%d' % equip.SELL_PRICE))
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	168 doc.br(space[1])
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	169 fix_widths(doc)
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	170 for word in "Damaged equipment will be sold for less than" \
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	171 " the sell price.".split():
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	172 doc.add(gui.Label(word))
49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	173 doc.space(space)
287 21b0c4a99c0a Add close button to price dialog Neil Muller <drnlmuller@gmail.com> parents: 286 diff changeset	174 close_button = gui.Button("Close")
21b0c4a99c0a Add close button to price dialog Neil Muller <drnlmuller@gmail.com> parents: 286 diff changeset	175 tbl.td(doc, colspan=3)
21b0c4a99c0a Add close button to price dialog Neil Muller <drnlmuller@gmail.com> parents: 286 diff changeset	176 tbl.tr()
21b0c4a99c0a Add close button to price dialog Neil Muller <drnlmuller@gmail.com> parents: 286 diff changeset	177 tbl.td(gui.Label(''))
21b0c4a99c0a Add close button to price dialog Neil Muller <drnlmuller@gmail.com> parents: 286 diff changeset	178 tbl.td(gui.Label(''))
21b0c4a99c0a Add close button to price dialog Neil Muller <drnlmuller@gmail.com> parents: 286 diff changeset	179 tbl.td(close_button)
21b0c4a99c0a Add close button to price dialog Neil Muller <drnlmuller@gmail.com> parents: 286 diff changeset	180 dialog = gui.Dialog(gui.Label('Price Reference'), tbl)
21b0c4a99c0a Add close button to price dialog Neil Muller <drnlmuller@gmail.com> parents: 286 diff changeset	181 close_button.connect(gui.CLICK, dialog.close)
286 49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	182 dialog.open()
292 bf271e857157 Clear tool when calling price dialog Neil Muller <drnlmuller@gmail.com> parents: 290 diff changeset	183 self.anim_clear_tool = True
286 49418fd43748 Price reference dialog - without close button Neil Muller <drnlmuller@gmail.com> parents: 278 diff changeset	184
109 48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	185 update_cash_counter = mkcountupdate('cash_counter')
48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	186 update_fox_counter = mkcountupdate('killed_foxes')
48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	187 update_chicken_counter = mkcountupdate('chicken_counter')
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	188 update_egg_counter = mkcountupdate('egg_counter')
139 1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	189 update_day_counter = mkcountupdate('day_counter')
79 8241386a1651 Add chicken counter Neil Muller <drnlmuller@gmail.com> parents: 77 diff changeset	190
168 1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	191 def add_spacer(self, height):
83 9bd2c22e1746 Cleaned up some toolbar code a bit. Jeremy Thurgood <firxen@gmail.com> parents: 80 diff changeset	192 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	193 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	194
154 3afdefacb07f Neaten up toolbar. Simon Cross <hodgestar@gmail.com> parents: 153 diff changeset	195 def add_heading(self, text):
3afdefacb07f Neaten up toolbar. Simon Cross <hodgestar@gmail.com> parents: 153 diff changeset	196 self.tr()
3afdefacb07f Neaten up toolbar. Simon Cross <hodgestar@gmail.com> parents: 153 diff changeset	197 self.td(mklabel(text), colspan=2)
3afdefacb07f Neaten up toolbar. Simon Cross <hodgestar@gmail.com> parents: 153 diff changeset	198
270 31f5033eac70 Add prices to all tools where is makes sense to do so. Simon Cross <hodgestar@gmail.com> parents: 264 diff changeset	199 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	200 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	201 text = "%s (%s)" % (text, price)
245 634491bf37e8 Change toolbar to gui.Toolbar -- gives nicer highlighting. Simon Cross <hodgestar@gmail.com> parents: 243 diff changeset	202 self.add_tool(text, lambda: self.gameboard.set_selected_tool(tool,
162 fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	203 cursor))
83 9bd2c22e1746 Cleaned up some toolbar code a bit. Jeremy Thurgood <firxen@gmail.com> parents: 80 diff changeset	204
245 634491bf37e8 Change toolbar to gui.Toolbar -- gives nicer highlighting. Simon Cross <hodgestar@gmail.com> parents: 243 diff changeset	205 def add_tool(self, text, func):
634491bf37e8 Change toolbar to gui.Toolbar -- gives nicer highlighting. Simon Cross <hodgestar@gmail.com> parents: 243 diff changeset	206 label = gui.basic.Label(text)
634491bf37e8 Change toolbar to gui.Toolbar -- gives nicer highlighting. Simon Cross <hodgestar@gmail.com> parents: 243 diff changeset	207 value = self._next_tool_value
634491bf37e8 Change toolbar to gui.Toolbar -- gives nicer highlighting. Simon Cross <hodgestar@gmail.com> parents: 243 diff changeset	208 self._next_tool_value += 1
634491bf37e8 Change toolbar to gui.Toolbar -- gives nicer highlighting. Simon Cross <hodgestar@gmail.com> parents: 243 diff changeset	209 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	210 tool.connect(gui.CLICK, func)
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	211 self.tr()
245 634491bf37e8 Change toolbar to gui.Toolbar -- gives nicer highlighting. Simon Cross <hodgestar@gmail.com> parents: 243 diff changeset	212 self.td(tool, align=-1, colspan=2)
634491bf37e8 Change toolbar to gui.Toolbar -- gives nicer highlighting. Simon Cross <hodgestar@gmail.com> parents: 243 diff changeset	213
634491bf37e8 Change toolbar to gui.Toolbar -- gives nicer highlighting. Simon Cross <hodgestar@gmail.com> parents: 243 diff changeset	214 def clear_tool(self):
634491bf37e8 Change toolbar to gui.Toolbar -- gives nicer highlighting. Simon Cross <hodgestar@gmail.com> parents: 243 diff changeset	215 self.group.value = None
288 5539744cfd40 Clear tool selection status when cancelling a tool Neil Muller <drnlmuller@gmail.com> parents: 287 diff changeset	216 for item in self.group.widgets:
5539744cfd40 Clear tool selection status when cancelling a tool Neil Muller <drnlmuller@gmail.com> parents: 287 diff changeset	217 item.pcls = ""
292 bf271e857157 Clear tool when calling price dialog Neil Muller <drnlmuller@gmail.com> parents: 290 diff changeset	218 self.anim_clear_tool = False
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	219
83 9bd2c22e1746 Cleaned up some toolbar code a bit. Jeremy Thurgood <firxen@gmail.com> parents: 80 diff changeset	220 def add_counter(self, icon, label):
9bd2c22e1746 Cleaned up some toolbar code a bit. Jeremy Thurgood <firxen@gmail.com> parents: 80 diff changeset	221 self.tr()
168 1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	222 self.td(icon, width=self.rect.w/2)
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	223 self.td(label, width=self.rect.w/2)
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	224
152 702bc0eb2ac3 Fix Toolbar width to TOOLBAR_WIDTH by not allowing it to resize. Simon Cross <hodgestar@gmail.com> parents: 151 diff changeset	225 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	226 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	227 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	228 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	229
702bc0eb2ac3 Fix Toolbar width to TOOLBAR_WIDTH by not allowing it to resize. Simon Cross <hodgestar@gmail.com> parents: 151 diff changeset	230
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	231 class VidWidget(gui.Widget):
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	232 def __init__(self, gameboard, vid, **params):
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	233 gui.Widget.__init__(self, **params)
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	234 self.gameboard = gameboard
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	235 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	236 self.vid.bounds = pygame.Rect((0, 0), vid.tile_to_view(vid.size))
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	237
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	238 def paint(self, surface):
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	239 self.vid.paint(surface)
202 3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	240 # Blit animation frames on top of the drawing
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	241 x, y = self.vid.view.x, self.vid.view.y
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	242 for anim in self.gameboard.animations:
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	243 anim.fix_pos(self.vid)
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	244 anim.irect.x = anim.rect.x - anim.shape.x
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	245 anim.irect.y = anim.rect.y - anim.shape.y
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	246 surface.blit(anim.image, (anim.irect.x - x, anim.irect.y - y))
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	247 # We don't store anim._irect, since we only update anims if the
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	248 # image changes, which kills irect
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	249
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	250 def update(self, surface):
202 3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	251 us = []
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	252 x, y = self.vid.view.x, self.vid.view.y
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	253 for anim in self.gameboard.animations[:]:
234 ee1ac134022d Fix drawing bug with multiframe animations Neil Muller <drnlmuller@gmail.com> parents: 232 diff changeset	254 if anim.updated or anim.removed:
ee1ac134022d Fix drawing bug with multiframe animations Neil Muller <drnlmuller@gmail.com> parents: 232 diff changeset	255 # We flag that we need to redraw stuff undeneath the animation
202 3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	256 us.append(pygame.Rect(anim.irect.x - x, anim.irect.y - y,
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	257 anim.irect.width, anim.irect.height))
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	258 self.vid.alayer[anim.pos.y][anim.pos.x]=1
212 b999abd5993b Fix missed status flag in animations Neil Muller <drnlmuller@gmail.com> parents: 208 diff changeset	259 self.vid.updates.append(anim.pos.to_tuple())
234 ee1ac134022d Fix drawing bug with multiframe animations Neil Muller <drnlmuller@gmail.com> parents: 232 diff changeset	260 if anim.removed:
ee1ac134022d Fix drawing bug with multiframe animations Neil Muller <drnlmuller@gmail.com> parents: 232 diff changeset	261 # Remove the animation from the draw loop
ee1ac134022d Fix drawing bug with multiframe animations Neil Muller <drnlmuller@gmail.com> parents: 232 diff changeset	262 self.gameboard.animations.remove(anim)
202 3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	263 us.extend(self.vid.update(surface))
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	264 for anim in self.gameboard.animations:
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	265 if anim.updated:
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	266 anim.fix_pos(self.vid)
234 ee1ac134022d Fix drawing bug with multiframe animations Neil Muller <drnlmuller@gmail.com> parents: 232 diff changeset	267 # setimage has happened, so redraw
202 3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	268 anim.irect.x = anim.rect.x - anim.shape.x
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	269 anim.irect.y = anim.rect.y - anim.shape.y
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	270 surface.blit(anim.image, (anim.irect.x - x, anim.irect.y - y))
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	271 anim.updated = 0
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	272 us.append(pygame.Rect(anim.irect.x - x, anim.irect.y - y,
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	273 anim.irect.width, anim.irect.height))
234 ee1ac134022d Fix drawing bug with multiframe animations Neil Muller <drnlmuller@gmail.com> parents: 232 diff changeset	274 # This is enough, because sprite changes happen disjoint
ee1ac134022d Fix drawing bug with multiframe animations Neil Muller <drnlmuller@gmail.com> parents: 232 diff changeset	275 # from the animation sequence, so we don't need to worry
ee1ac134022d Fix drawing bug with multiframe animations Neil Muller <drnlmuller@gmail.com> parents: 232 diff changeset	276 # other changes forcing us to redraw the animation frame.
202 3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	277 return us
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	278
39 ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	279 def move_view(self, x, y):
ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	280 self.vid.view.move_ip((x, y))
ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	281
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	282 def event(self, e):
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	283 if e.type == MOUSEBUTTONDOWN:
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	284 self.gameboard.use_tool(e)
186 f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	285 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	286 self.gameboard.update_sprite_cursor(e)
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	287
9 3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	288 class GameBoard(object):
3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	289 TILE_DIMENSIONS = (20, 20)
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	290 TOOLBAR_WIDTH = 140
9 3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	291
66 edc15ce8fa30 Implement fence selling (a bit hackish, but fine for now). Simon Cross <hodgestar@gmail.com> parents: 65 diff changeset	292 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	293 FENCE = tiles.REVERSE_TILE_MAP['fence']
79 8241386a1651 Add chicken counter Neil Muller <drnlmuller@gmail.com> parents: 77 diff changeset	294 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	295 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	296
290 664bba9be40a Fences are eclectic. Jeremy Thurgood <firxen@gmail.com> parents: 289 diff changeset	297 # These don't have to add up to 100, but it's easier to think
664bba9be40a Fences are eclectic. Jeremy Thurgood <firxen@gmail.com> parents: 289 diff changeset	298 # about them if they do.
241 1a7000c8211c Demolition foxes, including better fox selection. Jeremy Thurgood <firxen@gmail.com> parents: 239 diff changeset	299 FOX_WEIGHTINGS = (
290 664bba9be40a Fences are eclectic. Jeremy Thurgood <firxen@gmail.com> parents: 289 diff changeset	300 (animal.Fox, 59),
241 1a7000c8211c Demolition foxes, including better fox selection. Jeremy Thurgood <firxen@gmail.com> parents: 239 diff changeset	301 (animal.GreedyFox, 30),
1a7000c8211c Demolition foxes, including better fox selection. Jeremy Thurgood <firxen@gmail.com> parents: 239 diff changeset	302 (animal.NinjaFox, 5),
1a7000c8211c Demolition foxes, including better fox selection. Jeremy Thurgood <firxen@gmail.com> parents: 239 diff changeset	303 (animal.DemoFox, 5),
290 664bba9be40a Fences are eclectic. Jeremy Thurgood <firxen@gmail.com> parents: 289 diff changeset	304 (animal.Rinkhals, 1),
241 1a7000c8211c Demolition foxes, including better fox selection. Jeremy Thurgood <firxen@gmail.com> parents: 239 diff changeset	305 )
1a7000c8211c Demolition foxes, including better fox selection. Jeremy Thurgood <firxen@gmail.com> parents: 239 diff changeset	306
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	307 def __init__(self, main_app):
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	308 self.disp = main_app
24 7584453f4944 Add support for PNG tiles. Simon Cross <hodgestar@gmail.com> parents: 17 diff changeset	309 self.tv = tiles.FarmVid()
7584453f4944 Add support for PNG tiles. Simon Cross <hodgestar@gmail.com> parents: 17 diff changeset	310 self.tv.png_folder_load_tiles(data.filepath('tiles'))
278 f6bd57494e81 Better tile/level tools. Also better game board. Jeremy Thurgood <firxen@gmail.com> parents: 275 diff changeset	311 self.tv.tga_load_level(data.filepath('levels/farm.tga'))
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	312 self.create_display()
40 678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	313
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	314 self.selected_tool = None
105 7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	315 self.animal_to_place = None
186 f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	316 self.sprite_cursor = None
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	317 self.chickens = set()
d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	318 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	319 self.buildings = []
202 3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	320 self.animations = []
40 678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	321 self.cash = 0
118 2c76ed47fc44 Remove chicken respawn at day start. Handle eaten chickens in henhouses better Neil Muller <drnlmuller@gmail.com> parents: 116 diff changeset	322 self.eggs = 0
139 1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	323 self.days = 0
79 8241386a1651 Add chicken counter Neil Muller <drnlmuller@gmail.com> parents: 77 diff changeset	324 self.killed_foxes = 0
52 0d4799866bcf Sell chickens and buy fences. Jeremy Thurgood <firxen@gmail.com> parents: 40 diff changeset	325 self.add_cash(constants.STARTING_CASH)
223 527a5d4e3fa3 Disable tools at night. Simon Cross <hodgestar@gmail.com> parents: 221 diff changeset	326 self.day, self.night = True, False
17 cbbc5da7708a Interaction with the game board. Jeremy Thurgood <firxen@gmail.com> parents: 14 diff changeset	327
67 9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	328 self.fix_buildings()
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	329
118 2c76ed47fc44 Remove chicken respawn at day start. Handle eaten chickens in henhouses better Neil Muller <drnlmuller@gmail.com> parents: 116 diff changeset	330 self.add_some_chickens()
2c76ed47fc44 Remove chicken respawn at day start. Handle eaten chickens in henhouses better Neil Muller <drnlmuller@gmail.com> parents: 116 diff changeset	331
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	332 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	333 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	334
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	335 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	336 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	337 tbl = gui.Table()
5569430fd82e Display cleanup and rationalisation. Jeremy Thurgood <firxen@gmail.com> parents: 35 diff changeset	338 tbl.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	339 self.toolbar = ToolBar(self, width=self.TOOLBAR_WIDTH)
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	340 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	341 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	342 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	343 self.top_widget = tbl
14 d7f295c06a4b Split gameboard screen. Jeremy Thurgood <firxen@gmail.com> parents: 12 diff changeset	344
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	345 def update(self):
37 497b53b69280 Always update the vidwidget. Jeremy Thurgood <firxen@gmail.com> parents: 36 diff changeset	346 self.tvw.reupdate()
9 3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	347
3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	348 def loop(self):
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: 24 diff changeset	349 self.tv.loop()
9 3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	350
162 fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	351 def set_selected_tool(self, tool, cursor):
223 527a5d4e3fa3 Disable tools at night. Simon Cross <hodgestar@gmail.com> parents: 221 diff changeset	352 if not self.day:
527a5d4e3fa3 Disable tools at night. Simon Cross <hodgestar@gmail.com> parents: 221 diff changeset	353 return
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	354 self.selected_tool = tool
213 07b361ebd87f Ensure we clean up highlights, etc. Neil Muller <drnlmuller@gmail.com> parents: 212 diff changeset	355 if self.animal_to_place:
07b361ebd87f Ensure we clean up highlights, etc. Neil Muller <drnlmuller@gmail.com> parents: 212 diff changeset	356 # Clear any highlights
07b361ebd87f Ensure we clean up highlights, etc. Neil Muller <drnlmuller@gmail.com> parents: 212 diff changeset	357 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	358 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	359 sprite_curs = None
653da96db572 Fixed dangling cursor sprite and did some TODO list maintenance. Jeremy Thurgood <firxen@gmail.com> parents: 202 diff changeset	360 if buildings.is_building(tool):
232 0bd214cf9018 Overlay cost on building sprite cursors. Simon Cross <hodgestar@gmail.com> parents: 228 diff changeset	361 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	362 elif equipment.is_equipment(tool):
5b9cd693fe7c Add sprite cursors for equipment buying. Simon Cross <hodgestar@gmail.com> parents: 245 diff changeset	363 sprite_curs = sprite_cursor.SpriteCursor(tool.CHICKEN_IMAGE_FILE, self.tv)
5b9cd693fe7c Add sprite cursors for equipment buying. Simon Cross <hodgestar@gmail.com> parents: 245 diff changeset	364 elif tool == constants.TOOL_BUY_FENCE:
225 97a22d0b0471 Add sprite cursor for fence buying. Simon Cross <hodgestar@gmail.com> parents: 224 diff changeset	365 sprite_curs = sprite_cursor.SpriteCursor("tiles/fence.png", self.tv)
203 653da96db572 Fixed dangling cursor sprite and did some TODO list maintenance. Jeremy Thurgood <firxen@gmail.com> parents: 202 diff changeset	366 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	367
653da96db572 Fixed dangling cursor sprite and did some TODO list maintenance. Jeremy Thurgood <firxen@gmail.com> parents: 202 diff changeset	368 def set_cursor(self, cursor=None, sprite_curs=None):
162 fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	369 if cursor:
fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	370 pygame.mouse.set_cursor(*cursor)
fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	371 else:
fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	372 pygame.mouse.set_cursor(*cursors.cursors['arrow'])
218 5cb0e0b9cd16 Make sprite cursors stay on top by fudging the sprite list. :/ Simon Cross <hodgestar@gmail.com> parents: 217 diff changeset	373 self.sprite_cursor = sprite_curs
5cb0e0b9cd16 Make sprite cursors stay on top by fudging the sprite list. :/ Simon Cross <hodgestar@gmail.com> parents: 217 diff changeset	374 self.tv.sprites.set_cursor(sprite_curs)
213 07b361ebd87f Ensure we clean up highlights, etc. Neil Muller <drnlmuller@gmail.com> parents: 212 diff changeset	375
07b361ebd87f Ensure we clean up highlights, etc. Neil Muller <drnlmuller@gmail.com> parents: 212 diff changeset	376 def reset_states(self):
07b361ebd87f Ensure we clean up highlights, etc. Neil Muller <drnlmuller@gmail.com> parents: 212 diff changeset	377 """Clear current states (highlights, etc.)"""
245 634491bf37e8 Change toolbar to gui.Toolbar -- gives nicer highlighting. Simon Cross <hodgestar@gmail.com> parents: 243 diff changeset	378 self.set_selected_tool(None, None)
634491bf37e8 Change toolbar to gui.Toolbar -- gives nicer highlighting. Simon Cross <hodgestar@gmail.com> parents: 243 diff changeset	379 self.toolbar.clear_tool()
17 cbbc5da7708a Interaction with the game board. Jeremy Thurgood <firxen@gmail.com> parents: 14 diff changeset	380
186 f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	381 def update_sprite_cursor(self, e):
f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	382 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	383 self.sprite_cursor.set_pos(tile_pos)
f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	384
223 527a5d4e3fa3 Disable tools at night. Simon Cross <hodgestar@gmail.com> parents: 221 diff changeset	385 def start_night(self):
527a5d4e3fa3 Disable tools at night. Simon Cross <hodgestar@gmail.com> parents: 221 diff changeset	386 self.day, self.night = False, True
527a5d4e3fa3 Disable tools at night. Simon Cross <hodgestar@gmail.com> parents: 221 diff changeset	387 self.tv.sun(False)
527a5d4e3fa3 Disable tools at night. Simon Cross <hodgestar@gmail.com> parents: 221 diff changeset	388 self.reset_states()
527a5d4e3fa3 Disable tools at night. Simon Cross <hodgestar@gmail.com> parents: 221 diff changeset	389
527a5d4e3fa3 Disable tools at night. Simon Cross <hodgestar@gmail.com> parents: 221 diff changeset	390 def start_day(self):
527a5d4e3fa3 Disable tools at night. Simon Cross <hodgestar@gmail.com> parents: 221 diff changeset	391 self.day, self.night = True, False
527a5d4e3fa3 Disable tools at night. Simon Cross <hodgestar@gmail.com> parents: 221 diff changeset	392 self.tv.sun(True)
527a5d4e3fa3 Disable tools at night. Simon Cross <hodgestar@gmail.com> parents: 221 diff changeset	393 self.reset_states()
527a5d4e3fa3 Disable tools at night. Simon Cross <hodgestar@gmail.com> parents: 221 diff changeset	394
69 18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	395 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	396 """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	397 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	398 return False
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	399 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	400 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	401 return False
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	402 return True
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	403
17 cbbc5da7708a Interaction with the game board. Jeremy Thurgood <firxen@gmail.com> parents: 14 diff changeset	404 def use_tool(self, e):
223 527a5d4e3fa3 Disable tools at night. Simon Cross <hodgestar@gmail.com> parents: 221 diff changeset	405 if not self.day:
527a5d4e3fa3 Disable tools at night. Simon Cross <hodgestar@gmail.com> parents: 221 diff changeset	406 return
189 37af9e5dd292 Use tool with left button, cancel tool with right button. Jeremy Thurgood <firxen@gmail.com> parents: 186 diff changeset	407 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	408 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	409 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	410 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	411 return
52 0d4799866bcf Sell chickens and buy fences. Jeremy Thurgood <firxen@gmail.com> parents: 40 diff changeset	412 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	413 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	414 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	415 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	416 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	417 self.place_animal(self.tv.screen_to_tile(e.pos))
57 08665fa60345 Implement henhouses and henhouse adding. Simon Cross <hodgestar@gmail.com> parents: 54 diff changeset	418 elif self.selected_tool == constants.TOOL_BUY_FENCE:
54 b8f64db0d39e Cleaned up buying and selling a bit. Jeremy Thurgood <firxen@gmail.com> parents: 52 diff changeset	419 self.buy_fence(self.tv.screen_to_tile(e.pos))
65 7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	420 elif self.selected_tool == constants.TOOL_SELL_BUILDING:
7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	421 self.sell_building(self.tv.screen_to_tile(e.pos))
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	422 elif self.selected_tool == constants.TOOL_SELL_EQUIPMENT:
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	423 self.sell_equipment(self.tv.screen_to_tile(e.pos))
131 4527e09dc620 Add lumberjacks. Simon Cross <hodgestar@gmail.com> parents: 128 diff changeset	424 elif self.selected_tool == constants.TOOL_LOGGING:
4527e09dc620 Add lumberjacks. Simon Cross <hodgestar@gmail.com> parents: 128 diff changeset	425 self.logging_forest(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	426 elif buildings.is_building(self.selected_tool):
65 7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	427 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	428 elif equipment.is_equipment(self.selected_tool):
48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	429 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	430
166 4aa800354b7c Rename get_chicken to get_outside_chicken. Simon Cross <hodgestar@gmail.com> parents: 165 diff changeset	431 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	432 for chick in self.chickens:
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	433 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	434 return chick
b8f64db0d39e Cleaned up buying and selling a bit. Jeremy Thurgood <firxen@gmail.com> parents: 52 diff changeset	435 return None
57 08665fa60345 Implement henhouses and henhouse adding. Simon Cross <hodgestar@gmail.com> parents: 54 diff changeset	436
105 7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	437 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	438 for building in self.buildings:
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	439 if building.covers(tile_pos):
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	440 return building
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	441 return None
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	442
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	443 def sell_chicken(self, tile_pos):
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	444
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	445 def do_sell(chicken):
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	446 if not chicken:
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	447 return False # sanity check
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	448 if len(self.chickens) == 1:
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	449 print "You can't sell your last chicken!"
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	450 return False
228 f74de4280e20 Sell chicken's equipment when you sell the chicken. Simon Cross <hodgestar@gmail.com> parents: 227 diff changeset	451 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	452 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	453 chicken.unequip(item)
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	454 self.add_cash(constants.SELL_PRICE_CHICKEN)
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	455 sound.play_sound("sell-chicken.ogg")
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	456 return True
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	457
166 4aa800354b7c Rename get_chicken to get_outside_chicken. Simon Cross <hodgestar@gmail.com> parents: 165 diff changeset	458 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	459 if chick is None:
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	460 building = self.get_building(tile_pos)
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	461 if building and building.NAME in buildings.HENHOUSES:
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	462 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	463 return
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	464
226 86a6d9e360dd Fix outdoor chicken selling bug. Simon Cross <hodgestar@gmail.com> parents: 225 diff changeset	465 if do_sell(chick):
86a6d9e360dd Fix outdoor chicken selling bug. Simon Cross <hodgestar@gmail.com> parents: 225 diff changeset	466 self.remove_chicken(chick)
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	467
243 4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	468 def sell_one_egg(self, chicken):
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	469 if chicken.eggs:
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	470 self.add_cash(constants.SELL_PRICE_EGG)
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	471 chicken.remove_one_egg()
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	472 self.eggs -= 1
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	473 self.toolbar.update_egg_counter(self.eggs)
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	474 return True
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	475 return False
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	476
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	477 def sell_egg(self, tile_pos):
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	478 def do_sell(chicken):
243 4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	479 # We try sell and egg
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	480 if self.sell_one_egg(chicken):
193 db246683d5da Selling eggs now works Neil Muller <drnlmuller@gmail.com> parents: 192 diff changeset	481 sound.play_sound("sell-chicken.ogg")
243 4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	482 # Force toolbar update
193 db246683d5da Selling eggs now works Neil Muller <drnlmuller@gmail.com> parents: 192 diff changeset	483 self.toolbar.chsize()
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	484 return False
193 db246683d5da Selling eggs now works Neil Muller <drnlmuller@gmail.com> parents: 192 diff changeset	485
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	486 building = self.get_building(tile_pos)
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	487 if building and building.NAME in buildings.HENHOUSES:
193 db246683d5da Selling eggs now works Neil Muller <drnlmuller@gmail.com> parents: 192 diff changeset	488 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	489
200 67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	490 def select_animal_to_place(self, animal):
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	491 if self.animal_to_place:
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	492 self.animal_to_place.unequip_by_name("spotlight")
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	493 self.animal_to_place = animal
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	494 if self.animal_to_place:
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	495 self.animal_to_place.equip(equipment.Spotlight())
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	496
105 7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	497 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	498 """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	499
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	500 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	501 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	502 """
166 4aa800354b7c Rename get_chicken to get_outside_chicken. Simon Cross <hodgestar@gmail.com> parents: 165 diff changeset	503 chicken = self.get_outside_chicken(tile_pos)
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	504 if chicken:
108 437cbd856a03 Add occupants and abodes. Allowing moving chickens around. Simon Cross <hodgestar@gmail.com> parents: 105 diff changeset	505 if chicken is self.animal_to_place:
200 67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	506 self.select_animal_to_place(None)
165 c7d496556475 Minor cursor bugfixes Neil Muller <drnlmuller@gmail.com> parents: 164 diff changeset	507 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	508 else:
200 67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	509 self.select_animal_to_place(chicken)
162 fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	510 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	511 return
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	512 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	513 if building:
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	514 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	515 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	516 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	517 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	518 self.animal_to_place.equip(equipment.Nest())
200 67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	519 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	520 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	521 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	522 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	523 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	524 self.open_building_dialog(building)
108 437cbd856a03 Add occupants and abodes. Allowing moving chickens around. Simon Cross <hodgestar@gmail.com> parents: 105 diff changeset	525 return
437cbd856a03 Add occupants and abodes. Allowing moving chickens around. Simon Cross <hodgestar@gmail.com> parents: 105 diff changeset	526 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	527 if self.animal_to_place is not None:
201 fe1e9c18d4d7 layering bugfix; indoor chickens now use normal chicken icons Adrianna Pińska <adrianna.pinska@gmail.com> parents: 200 diff changeset	528 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	529 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	530 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	531 self.animal_to_place.remove_eggs()
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	532 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	533
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 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	535 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	536 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	537 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	538 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	539 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	540 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	541 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	542 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	543 self.set_visibility(chicken)
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	544
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	545 def set_visibility(self, chicken):
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	546 if chicken.outside():
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	547 if chicken not in self.tv.sprites:
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	548 self.tv.sprites.append(chicken)
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	549 else:
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	550 if chicken in self.tv.sprites:
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	551 self.tv.sprites.remove(chicken)
105 7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	552
170 92d11e0544bc Switch building to selected image when building is selected. Simon Cross <hodgestar@gmail.com> parents: 169 diff changeset	553 def open_dialog(self, widget, 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	554 """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	555 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	556
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	557 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	558 self.disp.close(tbl)
170 92d11e0544bc Switch building to selected image when building is selected. Simon Cross <hodgestar@gmail.com> parents: 169 diff changeset	559 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	560 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	561
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 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	563 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	564
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 = 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	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(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	568 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	569 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	570 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	571
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	572 self.disp.open(tbl)
169 946f09ed37cd Make equipment dialog close after selecting an item to sell. Simon Cross <hodgestar@gmail.com> parents: 168 diff changeset	573 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	574
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	575 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	576 """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	577
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	578 place_button_map = {}
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	579
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	580 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	581 """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	582 if animal:
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	583 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	584 if button:
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	585 if empty:
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	586 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	587 else:
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	588 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	589
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	590 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	591 """Handle a nest being clicked."""
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	592 # sell_callback should return true if we need to remove the
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	593 # occupant
208 f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	594 if place.occupant:
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	595 # 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	596 if not sell_callback:
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	597 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	598 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	599 # 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	600 update_button(old_animal)
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	601 # 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	602 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	603 else:
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	604 # Attempt to sell the occupant
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	605 if sell_callback(place.occupant):
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	606 # empty the nest (on button)
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	607 update_button(place.occupant, empty=True)
219 0a84d5aedc5c Remove eggs from chickens placed outside. Fix some bugs with setting the correct image on buttons Neil Muller <drnlmuller@gmail.com> parents: 218 diff changeset	608 self.remove_chicken(place.occupant)
216 962934b8c7dc Implement UI part of egg selling Neil Muller <drnlmuller@gmail.com> parents: 215 diff changeset	609 else:
962934b8c7dc Implement UI part of egg selling Neil Muller <drnlmuller@gmail.com> parents: 215 diff changeset	610 # Update for equipment changes, etc.
962934b8c7dc Implement UI part of egg selling Neil Muller <drnlmuller@gmail.com> parents: 215 diff changeset	611 update_button(place.occupant)
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	612 else:
208 f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	613 # 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	614 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	615 # 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	616 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	617 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	618 # 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	619 update_button(self.animal_to_place)
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	620
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	621 tbl = gui.Table()
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	622 columns = building.max_floor_width()
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	623 kwargs = { 'style': { 'padding_left': 10, 'padding_bottom': 10 }}
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	624 for floor in building.floors():
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	625 tbl.tr()
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	626 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	627 tbl.tr()
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	628 for row in floor.rows():
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	629 tbl.tr()
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	630 for place in row:
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	631 if place.occupant is None:
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	632 button = gui.Button(icons.EMPTY_NEST_ICON)
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	633 else:
201 fe1e9c18d4d7 layering bugfix; indoor chickens now use normal chicken icons Adrianna Pińska <adrianna.pinska@gmail.com> parents: 200 diff changeset	634 button = gui.Button(icons.animal_icon(place.occupant))
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	635 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	636 button.connect(gui.CLICK, nest_clicked, place, button)
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	637 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	638
170 92d11e0544bc Switch building to selected image when building is selected. Simon Cross <hodgestar@gmail.com> parents: 169 diff changeset	639 building.selected(True)
92d11e0544bc Switch building to selected image when building is selected. Simon Cross <hodgestar@gmail.com> parents: 169 diff changeset	640 def close_callback():
92d11e0544bc Switch building to selected image when building is selected. Simon Cross <hodgestar@gmail.com> parents: 169 diff changeset	641 building.selected(False)
92d11e0544bc Switch building to selected image when building is selected. Simon Cross <hodgestar@gmail.com> parents: 169 diff changeset	642
262 d508248041ff avoid passing events in twice Neil Muller <drnlmuller@gmail.com> parents: 258 diff changeset	643 def evict_callback():
264 812bd4cda8b8 evict button Neil Muller <drnlmuller@gmail.com> parents: 262 diff changeset	644 if not self.animal_to_place:
812bd4cda8b8 evict button Neil Muller <drnlmuller@gmail.com> parents: 262 diff changeset	645 return
812bd4cda8b8 evict button Neil Muller <drnlmuller@gmail.com> parents: 262 diff changeset	646 for tile_pos in building.adjacent_tiles():
812bd4cda8b8 evict button Neil Muller <drnlmuller@gmail.com> parents: 262 diff changeset	647 if self.tv.get(tile_pos) != self.GRASSLAND:
812bd4cda8b8 evict button Neil Muller <drnlmuller@gmail.com> parents: 262 diff changeset	648 continue
812bd4cda8b8 evict button Neil Muller <drnlmuller@gmail.com> parents: 262 diff changeset	649 if self.get_outside_chicken(tile_pos) is None:
812bd4cda8b8 evict button Neil Muller <drnlmuller@gmail.com> parents: 262 diff changeset	650 update_button(self.animal_to_place, empty=True)
812bd4cda8b8 evict button Neil Muller <drnlmuller@gmail.com> parents: 262 diff changeset	651 self.place_animal(tile_pos)
812bd4cda8b8 evict button Neil Muller <drnlmuller@gmail.com> parents: 262 diff changeset	652 break
262 d508248041ff avoid passing events in twice Neil Muller <drnlmuller@gmail.com> parents: 258 diff changeset	653
d508248041ff avoid passing events in twice Neil Muller <drnlmuller@gmail.com> parents: 258 diff changeset	654 if not sell_callback:
d508248041ff avoid passing events in twice Neil Muller <drnlmuller@gmail.com> parents: 258 diff changeset	655 tbl.tr()
d508248041ff avoid passing events in twice Neil Muller <drnlmuller@gmail.com> parents: 258 diff changeset	656 button = gui.Button('Evict')
d508248041ff avoid passing events in twice Neil Muller <drnlmuller@gmail.com> parents: 258 diff changeset	657 button.connect(gui.CLICK, evict_callback)
d508248041ff avoid passing events in twice Neil Muller <drnlmuller@gmail.com> parents: 258 diff changeset	658 tbl.td(button, colspan=2, **kwargs)
d508248041ff avoid passing events in twice Neil Muller <drnlmuller@gmail.com> parents: 258 diff changeset	659
170 92d11e0544bc Switch building to selected image when building is selected. Simon Cross <hodgestar@gmail.com> parents: 169 diff changeset	660 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	661
54 b8f64db0d39e Cleaned up buying and selling a bit. Jeremy Thurgood <firxen@gmail.com> parents: 52 diff changeset	662 def buy_fence(self, tile_pos):
69 18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	663 this_tile = self.tv.get(tile_pos)
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	664 if this_tile not in [self.GRASSLAND, self.BROKEN_FENCE]:
54 b8f64db0d39e Cleaned up buying and selling a bit. Jeremy Thurgood <firxen@gmail.com> parents: 52 diff changeset	665 return
77 65958516c7d9 Implement separate fence repair cost (currently 25 groats). Simon Cross <hodgestar@gmail.com> parents: 73 diff changeset	666 if this_tile == self.GRASSLAND:
65958516c7d9 Implement separate fence repair cost (currently 25 groats). Simon Cross <hodgestar@gmail.com> parents: 73 diff changeset	667 cost = constants.BUY_PRICE_FENCE
65958516c7d9 Implement separate fence repair cost (currently 25 groats). Simon Cross <hodgestar@gmail.com> parents: 73 diff changeset	668 else:
65958516c7d9 Implement separate fence repair cost (currently 25 groats). Simon Cross <hodgestar@gmail.com> parents: 73 diff changeset	669 cost = constants.REPAIR_PRICE_FENCE
191 3c80f49d7d74 Don't allow buildings and fences to be built on top of chickens. Simon Cross <hodgestar@gmail.com> parents: 189 diff changeset	670 if any((chicken.pos.x, chicken.pos.y) == tile_pos 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	671 return
3c80f49d7d74 Don't allow buildings and fences to be built on top of chickens. Simon Cross <hodgestar@gmail.com> parents: 189 diff changeset	672
77 65958516c7d9 Implement separate fence repair cost (currently 25 groats). Simon Cross <hodgestar@gmail.com> parents: 73 diff changeset	673 if self.cash < cost:
54 b8f64db0d39e Cleaned up buying and selling a bit. Jeremy Thurgood <firxen@gmail.com> parents: 52 diff changeset	674 print "You can't afford a fence."
b8f64db0d39e Cleaned up buying and selling a bit. Jeremy Thurgood <firxen@gmail.com> parents: 52 diff changeset	675 return
77 65958516c7d9 Implement separate fence repair cost (currently 25 groats). Simon Cross <hodgestar@gmail.com> parents: 73 diff changeset	676 self.add_cash(-cost)
66 edc15ce8fa30 Implement fence selling (a bit hackish, but fine for now). Simon Cross <hodgestar@gmail.com> parents: 65 diff changeset	677 self.tv.set(tile_pos, self.FENCE)
edc15ce8fa30 Implement fence selling (a bit hackish, but fine for now). Simon Cross <hodgestar@gmail.com> parents: 65 diff changeset	678
edc15ce8fa30 Implement fence selling (a bit hackish, but fine for now). Simon Cross <hodgestar@gmail.com> parents: 65 diff changeset	679 def sell_fence(self, tile_pos):
227 b9782f622006 Allow selling of broken fences. Simon Cross <hodgestar@gmail.com> parents: 226 diff changeset	680 this_tile = self.tv.get(tile_pos)
b9782f622006 Allow selling of broken fences. Simon Cross <hodgestar@gmail.com> parents: 226 diff changeset	681 if this_tile not in [self.FENCE, self.BROKEN_FENCE]:
66 edc15ce8fa30 Implement fence selling (a bit hackish, but fine for now). Simon Cross <hodgestar@gmail.com> parents: 65 diff changeset	682 return
227 b9782f622006 Allow selling of broken fences. Simon Cross <hodgestar@gmail.com> parents: 226 diff changeset	683 if this_tile == self.FENCE:
b9782f622006 Allow selling of broken fences. Simon Cross <hodgestar@gmail.com> parents: 226 diff changeset	684 self.add_cash(constants.SELL_PRICE_FENCE)
b9782f622006 Allow selling of broken fences. Simon Cross <hodgestar@gmail.com> parents: 226 diff changeset	685 elif this_tile == self.BROKEN_FENCE:
b9782f622006 Allow selling of broken fences. Simon Cross <hodgestar@gmail.com> parents: 226 diff changeset	686 self.add_cash(constants.SELL_PRICE_BROKEN_FENCE)
66 edc15ce8fa30 Implement fence selling (a bit hackish, but fine for now). Simon Cross <hodgestar@gmail.com> parents: 65 diff changeset	687 self.tv.set(tile_pos, self.GRASSLAND)
54 b8f64db0d39e Cleaned up buying and selling a bit. Jeremy Thurgood <firxen@gmail.com> parents: 52 diff changeset	688
131 4527e09dc620 Add lumberjacks. Simon Cross <hodgestar@gmail.com> parents: 128 diff changeset	689 def logging_forest(self, tile_pos):
4527e09dc620 Add lumberjacks. Simon Cross <hodgestar@gmail.com> parents: 128 diff changeset	690 if self.tv.get(tile_pos) != self.WOODLAND:
4527e09dc620 Add lumberjacks. Simon Cross <hodgestar@gmail.com> parents: 128 diff changeset	691 return
135 149822fbebeb Check that there is enough cash before logging. Simon Cross <hodgestar@gmail.com> parents: 131 diff changeset	692 if self.cash < constants.LOGGING_PRICE:
149822fbebeb Check that there is enough cash before logging. Simon Cross <hodgestar@gmail.com> parents: 131 diff changeset	693 return
131 4527e09dc620 Add lumberjacks. Simon Cross <hodgestar@gmail.com> parents: 128 diff changeset	694 self.add_cash(-constants.LOGGING_PRICE)
4527e09dc620 Add lumberjacks. Simon Cross <hodgestar@gmail.com> parents: 128 diff changeset	695 self.tv.set(tile_pos, self.GRASSLAND)
4527e09dc620 Add lumberjacks. Simon Cross <hodgestar@gmail.com> parents: 128 diff changeset	696
65 7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	697 def buy_building(self, tile_pos, building_cls):
7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	698 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	699 if self.cash < building.buy_price():
57 08665fa60345 Implement henhouses and henhouse adding. Simon Cross <hodgestar@gmail.com> parents: 54 diff changeset	700 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	701 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	702 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	703 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	704 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	705 self.add_building(building)
60 e2631c8e2cd6 Implement guard towers (with temporary sprite PNG). Simon Cross <hodgestar@gmail.com> parents: 57 diff changeset	706
109 48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	707 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	708
109 48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	709 equipment = equipment_cls()
298 88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	710
88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	711 def do_equip(chicken):
88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	712 # Try to equip the chicken
88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	713 if equipment.place(chicken):
88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	714 self.add_cash(-equipment.buy_price())
88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	715 chicken.equip(equipment)
88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	716 return False
88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	717
88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	718 chicken = self.get_outside_chicken(tile_pos)
88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	719 if self.cash < equipment.buy_price():
109 48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	720 return
298 88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	721 if chicken is None:
88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	722 building = self.get_building(tile_pos)
88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	723 if building is None:
88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	724 return
88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	725 # Bounce through open dialog once more
88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	726 self.open_building_dialog(building, do_equip)
88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	727 else:
88a626202591 Buy equipment for chickens in buildings Neil Muller <drnlmuller@gmail.com> parents: 294 diff changeset	728 do_equip(chicken)
109 48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	729
65 7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	730 def sell_building(self, tile_pos):
227 b9782f622006 Allow selling of broken fences. Simon Cross <hodgestar@gmail.com> parents: 226 diff changeset	731 if self.tv.get(tile_pos) in [self.FENCE, self.BROKEN_FENCE]:
66 edc15ce8fa30 Implement fence selling (a bit hackish, but fine for now). Simon Cross <hodgestar@gmail.com> parents: 65 diff changeset	732 return self.sell_fence(tile_pos)
105 7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	733 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	734 if building is None:
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	735 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	736 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	737 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	738 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	739 return
105 7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	740 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	741 building.remove(self.tv)
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	742 self.remove_building(building)
65 7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	743
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	744 def sell_equipment(self, tile_pos):
166 4aa800354b7c Rename get_chicken to get_outside_chicken. Simon Cross <hodgestar@gmail.com> parents: 165 diff changeset	745 chicken = self.get_outside_chicken(tile_pos)
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	746 if chicken is None or not chicken.equipment:
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	747 return
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	748 if len(chicken.equipment) == 1:
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	749 item = chicken.equipment[0]
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	750 self.add_cash(item.sell_price())
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	751 chicken.unequip(item)
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	752 else:
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	753 self.open_equipment_dialog(chicken)
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	754
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	755 def open_equipment_dialog(self, chicken):
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	756 tbl = gui.Table()
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	757
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	758 def sell_item(item, button):
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	759 """Select item of equipment."""
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	760 self.add_cash(item.sell_price())
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	761 chicken.unequip(item)
169 946f09ed37cd Make equipment dialog close after selecting an item to sell. Simon Cross <hodgestar@gmail.com> parents: 168 diff changeset	762 self.disp.close(dialog)
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	763
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	764 kwargs = { 'style': { 'padding_left': 10, 'padding_bottom': 10 }}
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	765
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	766 tbl.tr()
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	767 tbl.td(gui.Button("Sell ... "), align=-1, **kwargs)
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	768
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	769 for item in chicken.equipment:
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	770 tbl.tr()
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	771 button = gui.Button(item.name().title())
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	772 button.connect(gui.CLICK, sell_item, item, button)
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	773 tbl.td(button, align=1, **kwargs)
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	774
169 946f09ed37cd Make equipment dialog close after selecting an item to sell. Simon Cross <hodgestar@gmail.com> parents: 168 diff changeset	775 dialog = self.open_dialog(tbl)
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	776
14 d7f295c06a4b Split gameboard screen. Jeremy Thurgood <firxen@gmail.com> parents: 12 diff changeset	777 def event(self, e):
262 d508248041ff avoid passing events in twice Neil Muller <drnlmuller@gmail.com> parents: 258 diff changeset	778 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	779 if e.key == K_UP:
ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	780 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	781 if e.key == K_DOWN:
ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	782 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	783 if e.key == K_LEFT:
ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	784 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	785 if e.key == K_RIGHT:
ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	786 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	787 return True
d508248041ff avoid passing events in twice Neil Muller <drnlmuller@gmail.com> parents: 258 diff changeset	788 return False
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: 24 diff changeset	789
139 1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	790 def advance_day(self):
1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	791 self.days += 1
1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	792 self.toolbar.update_day_counter(self.days)
1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	793
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: 24 diff changeset	794 def clear_foxes(self):
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	795 for fox in self.foxes.copy():
80 ad9d1bc7ef0c Kill foxes that don't reach safety Neil Muller <drnlmuller@gmail.com> parents: 79 diff changeset	796 # 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	797 # killed
ad9d1bc7ef0c Kill foxes that don't reach safety Neil Muller <drnlmuller@gmail.com> parents: 79 diff changeset	798 if self.in_bounds(fox.pos) and self.tv.get(fox.pos.to_tuple()) \
ad9d1bc7ef0c Kill foxes that don't reach safety Neil Muller <drnlmuller@gmail.com> parents: 79 diff changeset	799 != self.WOODLAND:
84 5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	800 self.kill_fox(fox)
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	801 else:
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	802 self.tv.sprites.remove(fox)
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	803 self.foxes = set() # Remove all the foxes
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: 24 diff changeset	804
202 3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	805 def run_animations(self):
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	806 for anim in self.animations:
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	807 anim.animate()
292 bf271e857157 Clear tool when calling price dialog Neil Muller <drnlmuller@gmail.com> parents: 290 diff changeset	808 if self.toolbar.anim_clear_tool:
bf271e857157 Clear tool when calling price dialog Neil Muller <drnlmuller@gmail.com> parents: 290 diff changeset	809 self.toolbar.clear_tool()
202 3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	810
29 2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	811 def move_foxes(self):
122 d2b19131d537 Don't continue the night if we're not doing anything anymore Neil Muller <drnlmuller@gmail.com> parents: 119 diff changeset	812 """Move the foxes.
d2b19131d537 Don't continue the night if we're not doing anything anymore Neil Muller <drnlmuller@gmail.com> parents: 119 diff changeset	813
d2b19131d537 Don't continue the night if we're not doing anything anymore Neil Muller <drnlmuller@gmail.com> parents: 119 diff changeset	814 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	815 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	816 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	817 return True
d2b19131d537 Don't continue the night if we're not doing anything anymore Neil Muller <drnlmuller@gmail.com> parents: 119 diff changeset	818 over = True
29 2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	819 for fox in self.foxes:
2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	820 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	821 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	822 over = False
84 5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	823 for chicken in self.chickens:
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	824 chicken.attack(self)
122 d2b19131d537 Don't continue the night if we're not doing anything anymore Neil Muller <drnlmuller@gmail.com> parents: 119 diff changeset	825 return over
29 2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	826
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: 24 diff changeset	827 def add_chicken(self, chicken):
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	828 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	829 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	830 self.tv.sprites.append(chicken)
79 8241386a1651 Add chicken counter Neil Muller <drnlmuller@gmail.com> parents: 77 diff changeset	831 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	832
6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: 24 diff changeset	833 def add_fox(self, fox):
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	834 self.foxes.add(fox)
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: 24 diff changeset	835 self.tv.sprites.append(fox)
29 2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	836
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	837 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	838 self.buildings.append(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	839 self.tv.sprites.append(building)
60 e2631c8e2cd6 Implement guard towers (with temporary sprite PNG). Simon Cross <hodgestar@gmail.com> parents: 57 diff changeset	840
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	841 def lay_eggs(self):
118 2c76ed47fc44 Remove chicken respawn at day start. Handle eaten chickens in henhouses better Neil Muller <drnlmuller@gmail.com> parents: 116 diff changeset	842 self.eggs = 0
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	843 for building in self.buildings:
144 a9b800b4175e Add define for henhouses & egg laying. Neil Muller <drnlmuller@gmail.com> parents: 139 diff changeset	844 if building.NAME in buildings.HENHOUSES:
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	845 for chicken in building.occupants():
d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	846 chicken.lay()
243 4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	847 self.eggs += chicken.get_num_eggs()
118 2c76ed47fc44 Remove chicken respawn at day start. Handle eaten chickens in henhouses better Neil Muller <drnlmuller@gmail.com> parents: 116 diff changeset	848 self.toolbar.update_egg_counter(self.eggs)
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	849
d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	850 def hatch_eggs(self):
d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	851 for building in self.buildings:
144 a9b800b4175e Add define for henhouses & egg laying. Neil Muller <drnlmuller@gmail.com> parents: 139 diff changeset	852 if building.NAME in buildings.HENHOUSES:
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	853 for chicken in building.occupants():
243 4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	854 new_chick = chicken.hatch(self)
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	855 if new_chick:
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	856 try:
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	857 building.add_occupant(new_chick)
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	858 self.add_chicken(new_chick)
219 0a84d5aedc5c Remove eggs from chickens placed outside. Fix some bugs with setting the correct image on buttons Neil Muller <drnlmuller@gmail.com> parents: 218 diff changeset	859 new_chick.equip(equipment.Nest())
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	860 except buildings.BuildingFullError:
224 c279ad59b8e2 Chicks fill hen house, then adjacent spaces, then die. Simon Cross <hodgestar@gmail.com> parents: 223 diff changeset	861 # No space in the hen house, look nearby
c279ad59b8e2 Chicks fill hen house, then adjacent spaces, then die. Simon Cross <hodgestar@gmail.com> parents: 223 diff changeset	862 for tile_pos in building.adjacent_tiles():
c279ad59b8e2 Chicks fill hen house, then adjacent spaces, then die. Simon Cross <hodgestar@gmail.com> parents: 223 diff changeset	863 if self.tv.get(tile_pos) != self.GRASSLAND:
c279ad59b8e2 Chicks fill hen house, then adjacent spaces, then die. Simon Cross <hodgestar@gmail.com> parents: 223 diff changeset	864 continue
c279ad59b8e2 Chicks fill hen house, then adjacent spaces, then die. Simon Cross <hodgestar@gmail.com> parents: 223 diff changeset	865 if self.get_outside_chicken(tile_pos) is None:
c279ad59b8e2 Chicks fill hen house, then adjacent spaces, then die. Simon Cross <hodgestar@gmail.com> parents: 223 diff changeset	866 self.add_chicken(new_chick)
c279ad59b8e2 Chicks fill hen house, then adjacent spaces, then die. Simon Cross <hodgestar@gmail.com> parents: 223 diff changeset	867 self.relocate_animal(new_chick, tile_pos=tile_pos)
c279ad59b8e2 Chicks fill hen house, then adjacent spaces, then die. Simon Cross <hodgestar@gmail.com> parents: 223 diff changeset	868 break
221 d46ae64240a1 Accept that new chicks die if you don't treat them properly. Simon Cross <hodgestar@gmail.com> parents: 219 diff changeset	869 # if there isn't a space for the
d46ae64240a1 Accept that new chicks die if you don't treat them properly. Simon Cross <hodgestar@gmail.com> parents: 219 diff changeset	870 # new chick it dies. :/ Farm life
d46ae64240a1 Accept that new chicks die if you don't treat them properly. Simon Cross <hodgestar@gmail.com> parents: 219 diff changeset	871 # is cruel.
118 2c76ed47fc44 Remove chicken respawn at day start. Handle eaten chickens in henhouses better Neil Muller <drnlmuller@gmail.com> parents: 116 diff changeset	872 self.toolbar.update_egg_counter(self.eggs)
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	873
84 5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	874 def kill_fox(self, fox):
251 844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 247 diff changeset	875 self.killed_foxes += 1
844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 247 diff changeset	876 self.toolbar.update_fox_counter(self.killed_foxes)
844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 247 diff changeset	877 self.add_cash(constants.SELL_PRICE_DEAD_FOX)
844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 247 diff changeset	878 self.remove_fox(fox)
84 5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	879
29 2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	880 def remove_fox(self, fox):
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	881 self.foxes.discard(fox)
d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	882 if fox in self.tv.sprites:
29 2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	883 self.tv.sprites.remove(fox)
2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	884
2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	885 def remove_chicken(self, chick):
215 85a5299caf4a bugfix: deselect eaten chickens Adrianna Pińska <adrianna.pinska@gmail.com> parents: 213 diff changeset	886 if chick is self.animal_to_place:
85a5299caf4a bugfix: deselect eaten chickens Adrianna Pińska <adrianna.pinska@gmail.com> parents: 213 diff changeset	887 self.select_animal_to_place(None)
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	888 self.chickens.discard(chick)
243 4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	889 self.eggs -= chick.get_num_eggs()
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	890 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	891 if chick.abode:
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	892 chick.abode.clear_occupant()
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	893 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	894 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	895 self.tv.sprites.remove(chick)
40 678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	896
65 7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	897 def remove_building(self, building):
7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	898 if building in self.buildings:
7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	899 self.buildings.remove(building)
7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	900 self.tv.sprites.remove(building)
7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	901
40 678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	902 def add_cash(self, amount):
678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	903 self.cash += amount
678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	904 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	905
118 2c76ed47fc44 Remove chicken respawn at day start. Handle eaten chickens in henhouses better Neil Muller <drnlmuller@gmail.com> parents: 116 diff changeset	906 def add_some_chickens(self):
2c76ed47fc44 Remove chicken respawn at day start. Handle eaten chickens in henhouses better Neil Muller <drnlmuller@gmail.com> parents: 116 diff changeset	907 """Add some random chickens to start the game"""
69 18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	908 x, y = 0, 0
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	909 width, height = self.tv.size
238 1a7097c0fc8f Try harder to have 10 chickens at the start Neil Muller <drnlmuller@gmail.com> parents: 234 diff changeset	910 tries = 0
118 2c76ed47fc44 Remove chicken respawn at day start. Handle eaten chickens in henhouses better Neil Muller <drnlmuller@gmail.com> parents: 116 diff changeset	911 while len(self.chickens) < 10:
69 18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	912 if x < width:
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	913 tile = self.tv.get((x, y))
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	914 else:
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	915 y += 1
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	916 if y >= height:
238 1a7097c0fc8f Try harder to have 10 chickens at the start Neil Muller <drnlmuller@gmail.com> parents: 234 diff changeset	917 y = 0
1a7097c0fc8f Try harder to have 10 chickens at the start Neil Muller <drnlmuller@gmail.com> parents: 234 diff changeset	918 tries += 1
1a7097c0fc8f Try harder to have 10 chickens at the start Neil Muller <drnlmuller@gmail.com> parents: 234 diff changeset	919 if tries > 3:
1a7097c0fc8f Try harder to have 10 chickens at the start Neil Muller <drnlmuller@gmail.com> parents: 234 diff changeset	920 break # Things have gone wierd
69 18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	921 x = 0
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	922 continue
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	923 # See if we place a chicken
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	924 if 'grassland' == tiles.TILE_MAP[tile]:
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	925 # Farmland
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	926 roll = random.randint(1, 20)
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	927 # We don't place within a tile of the fence, this is to make things
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	928 # easier
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	929 for xx in range(x-1, x+2):
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	930 if xx >= width or xx < 0:
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	931 continue
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	932 for yy in range(y-1, y+2):
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	933 if yy >= height or yy < 0:
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	934 continue
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	935 neighbour = self.tv.get((xx, yy))
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	936 if 'fence' == tiles.TILE_MAP[neighbour]:
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	937 # Fence
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	938 roll = 10
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	939 if roll == 1:
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	940 # Create a chicken
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	941 chick = animal.Chicken((x, y))
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	942 self.add_chicken(chick)
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	943 x += 1
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	944
241 1a7000c8211c Demolition foxes, including better fox selection. Jeremy Thurgood <firxen@gmail.com> parents: 239 diff changeset	945 def _choose_fox(self, (x, y)):
1a7000c8211c Demolition foxes, including better fox selection. Jeremy Thurgood <firxen@gmail.com> parents: 239 diff changeset	946 fox_cls = misc.WeightedSelection(self.FOX_WEIGHTINGS).choose()
1a7000c8211c Demolition foxes, including better fox selection. Jeremy Thurgood <firxen@gmail.com> parents: 239 diff changeset	947 return fox_cls((x, y))
1a7000c8211c Demolition foxes, including better fox selection. Jeremy Thurgood <firxen@gmail.com> parents: 239 diff changeset	948
69 18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	949 def spawn_foxes(self):
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	950 """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	951 # 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	952 x, y = 0, 0
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	953 width, height = self.tv.size
239 8224d1ac99c7 Foxes tend to increase with time Neil Muller <drnlmuller@gmail.com> parents: 238 diff changeset	954 min_foxes = (self.days+3)/2 # always more than one fox
8224d1ac99c7 Foxes tend to increase with time Neil Muller <drnlmuller@gmail.com> parents: 238 diff changeset	955 new_foxes = random.randint(min_foxes, min_foxes*2)
69 18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	956 while len(self.foxes) < new_foxes:
73 f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	957 side = random.randint(0, 3)
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	958 if side == 0:
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	959 # top
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	960 y = -1
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	961 x = random.randint(-1, width)
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	962 elif side == 1:
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	963 # bottom
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	964 y = height
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	965 x = random.randint(-1, width)
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	966 elif side == 2:
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	967 # left
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	968 x = -1
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	969 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	970 else:
73 f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	971 x = width
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	972 y = random.randint(-1, height)
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	973 skip = False
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	974 for other_fox in self.foxes:
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	975 if other_fox.pos.x == x and other_fox.pos.y == y:
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	976 skip = True # Choose a new position
69 18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	977 break
73 f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	978 if not skip:
241 1a7000c8211c Demolition foxes, including better fox selection. Jeremy Thurgood <firxen@gmail.com> parents: 239 diff changeset	979 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	980
67 9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	981 def fix_buildings(self):
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	982 """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	983 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	984
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	985 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	986 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	987 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	988
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	989 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	990 """
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	991 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	992
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	993 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	994 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	995 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	996 tile_pos = (x, y)
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	997 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	998 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	999 continue
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	1000
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	1001 covered = False
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	1002 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	1003 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	1004 covered = True
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	1005 break
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	1006
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	1007 if covered:
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	1008 continue
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	1009
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	1010 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	1011 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	1012 building.remove(self.tv)
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	1013 building.place(self.tv)
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	1014 self.add_building(building)
139 1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	1015
1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	1016 def is_game_over(self):
1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	1017 """Return true if we're complete"""
1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	1018 if self.days > constants.TURN_LIMIT:
1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	1019 return True
1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	1020 if len(self.chickens) == 0:
1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	1021 return True

Mercurial > rinkhals

annotate gamelib/gameboard.py @ 298:88a626202591