rinkhals: gamelib/gameboard.py annotate

annotate gamelib/gameboard.py @ 201:fe1e9c18d4d7

layering bugfix; indoor chickens now use normal chicken icons

author	Adrianna Pińska <adrianna.pinska@gmail.com>
date	Fri, 04 Sep 2009 20:16:51 +0000
parents	67d10f7e0159
children	3074784c93f4

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
186 f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	4 from pygame.locals import MOUSEBUTTONDOWN, MOUSEMOTION, KEYDOWN, K_UP, K_DOWN, K_LEFT, K_RIGHT
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	5 from pgu import gui
9 3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	6
3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	7 import data
24 7584453f4944 Add support for PNG tiles. Simon Cross <hodgestar@gmail.com> parents: 17 diff changeset	8 import tiles
79 8241386a1651 Add chicken counter Neil Muller <drnlmuller@gmail.com> parents: 77 diff changeset	9 import icons
40 678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	10 import constants
57 08665fa60345 Implement henhouses and henhouse adding. Simon Cross <hodgestar@gmail.com> parents: 54 diff changeset	11 import buildings
69 18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	12 import animal
84 5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	13 import equipment
94 fa8d8fc1bf5b Added some sounds David Fraser <davidf@sjsoft.com> parents: 92 diff changeset	14 import sound
162 fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	15 import cursors
186 f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	16 import sprite_cursor
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	17
40 678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	18 class OpaqueLabel(gui.Label):
168 1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	19 def __init__(self, value, **params):
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	20 gui.Label.__init__(self, value, **params)
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	21 if 'width' in params:
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	22 self._width = params['width']
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	23 if 'height' in params:
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	24 self._height = params['height']
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	25 self._set_size()
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	26
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	27 def _set_size(self):
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	28 width, height = self.font.size(self.value)
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	29 width = getattr(self, '_width', width)
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	30 height = getattr(self, '_height', height)
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	31 self.style.width, self.style.height = width, height
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	32
40 678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	33 def paint(self, s):
678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	34 s.fill(self.style.background)
168 1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	35 if self.style.align > 0:
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	36 r = s.get_rect()
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	37 w, _ = self.font.size(self.value)
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	38 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	39 gui.Label.paint(self, s)
678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	40
678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	41 def update_value(self, value):
678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	42 self.value = value
168 1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	43 self._set_size()
40 678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	44 self.repaint()
678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	45
168 1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	46 def mklabel(text="", **params):
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	47 params.setdefault('color', constants.FG_COLOR)
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	48 params.setdefault('width', GameBoard.TOOLBAR_WIDTH/2)
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	49 return OpaqueLabel(text, **params)
109 48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	50
48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	51 def mkcountupdate(counter):
48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	52 def update_counter(self, value):
168 1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	53 getattr(self, counter).update_value("%s " % value)
109 48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	54 self.repaint()
48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	55 return update_counter
40 678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	56
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	57 class ToolBar(gui.Table):
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	58 def __init__(self, gameboard, **params):
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	59 gui.Table.__init__(self, **params)
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	60 self.gameboard = gameboard
168 1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	61 self.cash_counter = mklabel(align=1)
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	62 self.chicken_counter = mklabel(align=1)
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	63 self.egg_counter = mklabel(align=1)
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	64 self.day_counter = mklabel(align=1)
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	65 self.killed_foxes = mklabel(align=1)
83 9bd2c22e1746 Cleaned up some toolbar code a bit. Jeremy Thurgood <firxen@gmail.com> parents: 80 diff changeset	66
168 1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	67 self.tr()
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	68 self.td(gui.Spacer(self.rect.w/2, 0))
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	69 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	70 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	71 self.add_counter(mklabel("Groats:"), self.cash_counter)
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	72 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	73 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	74 self.add_counter(icons.KILLED_FOX, self.killed_foxes)
154 3afdefacb07f Neaten up toolbar. Simon Cross <hodgestar@gmail.com> parents: 153 diff changeset	75 self.add_spacer(20)
3afdefacb07f Neaten up toolbar. Simon Cross <hodgestar@gmail.com> parents: 153 diff changeset	76
162 fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	77 self.add_tool_button("Move Hen", constants.TOOL_PLACE_ANIMALS,
fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	78 cursors.cursors['select'])
154 3afdefacb07f Neaten up toolbar. Simon Cross <hodgestar@gmail.com> parents: 153 diff changeset	79 self.add_tool_button("Cut Trees", constants.TOOL_LOGGING)
3afdefacb07f Neaten up toolbar. Simon Cross <hodgestar@gmail.com> parents: 153 diff changeset	80 self.add_spacer(20)
83 9bd2c22e1746 Cleaned up some toolbar code a bit. Jeremy Thurgood <firxen@gmail.com> parents: 80 diff changeset	81
154 3afdefacb07f Neaten up toolbar. Simon Cross <hodgestar@gmail.com> parents: 153 diff changeset	82 self.add_heading("Sell ...")
162 fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	83 self.add_tool_button("Chicken", constants.TOOL_SELL_CHICKEN,
fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	84 cursors.cursors['select'])
fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	85 self.add_tool_button("Egg", constants.TOOL_SELL_EGG,
fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	86 cursors.cursors['select'])
fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	87 self.add_tool_button("Building", constants.TOOL_SELL_BUILDING,
fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	88 cursors.cursors['select'])
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	89 self.add_tool_button("Equipment", constants.TOOL_SELL_EQUIPMENT)
154 3afdefacb07f Neaten up toolbar. Simon Cross <hodgestar@gmail.com> parents: 153 diff changeset	90 self.add_spacer(20)
3afdefacb07f Neaten up toolbar. Simon Cross <hodgestar@gmail.com> parents: 153 diff changeset	91
3afdefacb07f Neaten up toolbar. Simon Cross <hodgestar@gmail.com> parents: 153 diff changeset	92 self.add_heading("Buy ...")
3afdefacb07f Neaten up toolbar. Simon Cross <hodgestar@gmail.com> parents: 153 diff changeset	93 self.add_tool_button("Fence", constants.TOOL_BUY_FENCE)
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	94 for building_cls in buildings.BUILDINGS:
162 fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	95 self.add_tool_button(building_cls.NAME.title(), building_cls,
fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	96 cursors.cursors.get('build', None))
109 48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	97 for equipment_cls in equipment.EQUIPMENT:
162 fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	98 self.add_tool_button(equipment_cls.NAME.title(), equipment_cls,
fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	99 cursors.cursors.get(equipment_cls.NAME, None))
168 1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	100 self.add_spacer(30)
151 082868bea873 Refactor UI so that only a single gui.App is used. Pass all UI events via main_app. Change Toolbar table to use .td() everywhere. Move toolbar to top. Simon Cross <hodgestar@gmail.com> parents: 148 diff changeset	101
83 9bd2c22e1746 Cleaned up some toolbar code a bit. Jeremy Thurgood <firxen@gmail.com> parents: 80 diff changeset	102 self.add_button("Finished Day", self.day_done)
68 6b8ac424da83 Add button for finishing day. Remove debugging print. Simon Cross <hodgestar@gmail.com> parents: 67 diff changeset	103
6b8ac424da83 Add button for finishing day. Remove debugging print. Simon Cross <hodgestar@gmail.com> parents: 67 diff changeset	104 def day_done(self):
6b8ac424da83 Add button for finishing day. Remove debugging print. Simon Cross <hodgestar@gmail.com> parents: 67 diff changeset	105 import engine
6b8ac424da83 Add button for finishing day. Remove debugging print. Simon Cross <hodgestar@gmail.com> parents: 67 diff changeset	106 pygame.event.post(engine.START_NIGHT)
6b8ac424da83 Add button for finishing day. Remove debugging print. Simon Cross <hodgestar@gmail.com> parents: 67 diff changeset	107
109 48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	108 update_cash_counter = mkcountupdate('cash_counter')
48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	109 update_fox_counter = mkcountupdate('killed_foxes')
48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	110 update_chicken_counter = mkcountupdate('chicken_counter')
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	111 update_egg_counter = mkcountupdate('egg_counter')
139 1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	112 update_day_counter = mkcountupdate('day_counter')
79 8241386a1651 Add chicken counter Neil Muller <drnlmuller@gmail.com> parents: 77 diff changeset	113
168 1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	114 def add_spacer(self, height):
83 9bd2c22e1746 Cleaned up some toolbar code a bit. Jeremy Thurgood <firxen@gmail.com> parents: 80 diff changeset	115 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	116 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	117
154 3afdefacb07f Neaten up toolbar. Simon Cross <hodgestar@gmail.com> parents: 153 diff changeset	118 def add_heading(self, text):
3afdefacb07f Neaten up toolbar. Simon Cross <hodgestar@gmail.com> parents: 153 diff changeset	119 self.tr()
3afdefacb07f Neaten up toolbar. Simon Cross <hodgestar@gmail.com> parents: 153 diff changeset	120 self.td(mklabel(text), colspan=2)
3afdefacb07f Neaten up toolbar. Simon Cross <hodgestar@gmail.com> parents: 153 diff changeset	121
162 fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	122 def add_tool_button(self, text, tool, cursor=None):
fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	123 self.add_button(text, lambda: self.gameboard.set_selected_tool(tool,
fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	124 cursor))
83 9bd2c22e1746 Cleaned up some toolbar code a bit. Jeremy Thurgood <firxen@gmail.com> parents: 80 diff changeset	125
9bd2c22e1746 Cleaned up some toolbar code a bit. Jeremy Thurgood <firxen@gmail.com> parents: 80 diff changeset	126 def add_button(self, text, func):
154 3afdefacb07f Neaten up toolbar. Simon Cross <hodgestar@gmail.com> parents: 153 diff changeset	127 button = gui.Button(text, width=self.rect.w, style={"padding_left": 0})
83 9bd2c22e1746 Cleaned up some toolbar code a bit. Jeremy Thurgood <firxen@gmail.com> parents: 80 diff changeset	128 button.connect(gui.CLICK, func)
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	129 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	130 self.td(button, align=-1, colspan=2)
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	131
83 9bd2c22e1746 Cleaned up some toolbar code a bit. Jeremy Thurgood <firxen@gmail.com> parents: 80 diff changeset	132 def add_counter(self, icon, label):
9bd2c22e1746 Cleaned up some toolbar code a bit. Jeremy Thurgood <firxen@gmail.com> parents: 80 diff changeset	133 self.tr()
168 1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	134 self.td(icon, width=self.rect.w/2)
1014bfcddc4c Fixed label alignment. Jeremy Thurgood <firxen@gmail.com> parents: 166 diff changeset	135 self.td(label, width=self.rect.w/2)
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	136
152 702bc0eb2ac3 Fix Toolbar width to TOOLBAR_WIDTH by not allowing it to resize. Simon Cross <hodgestar@gmail.com> parents: 151 diff changeset	137 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	138 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	139 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	140 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	141
702bc0eb2ac3 Fix Toolbar width to TOOLBAR_WIDTH by not allowing it to resize. Simon Cross <hodgestar@gmail.com> parents: 151 diff changeset	142
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	143 class VidWidget(gui.Widget):
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	144 def __init__(self, gameboard, vid, **params):
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	145 gui.Widget.__init__(self, **params)
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	146 self.gameboard = gameboard
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	147 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	148 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	149
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	150 def paint(self, surface):
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	151 self.vid.paint(surface)
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	152
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	153 def update(self, surface):
36 5569430fd82e Display cleanup and rationalisation. Jeremy Thurgood <firxen@gmail.com> parents: 35 diff changeset	154 return self.vid.update(surface)
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	155
39 ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	156 def move_view(self, x, y):
ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	157 self.vid.view.move_ip((x, y))
ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	158
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	159 def event(self, e):
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	160 if e.type == MOUSEBUTTONDOWN:
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	161 self.gameboard.use_tool(e)
186 f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	162 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	163 self.gameboard.update_sprite_cursor(e)
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	164
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	165
9 3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	166 class GameBoard(object):
3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	167 TILE_DIMENSIONS = (20, 20)
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	168 TOOLBAR_WIDTH = 140
9 3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	169
66 edc15ce8fa30 Implement fence selling (a bit hackish, but fine for now). Simon Cross <hodgestar@gmail.com> parents: 65 diff changeset	170 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	171 FENCE = tiles.REVERSE_TILE_MAP['fence']
79 8241386a1651 Add chicken counter Neil Muller <drnlmuller@gmail.com> parents: 77 diff changeset	172 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	173 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	174
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	175 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	176 self.disp = main_app
24 7584453f4944 Add support for PNG tiles. Simon Cross <hodgestar@gmail.com> parents: 17 diff changeset	177 self.tv = tiles.FarmVid()
9 3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	178 self.tv.tga_load_tiles(data.filepath('tiles.tga'), self.TILE_DIMENSIONS)
24 7584453f4944 Add support for PNG tiles. Simon Cross <hodgestar@gmail.com> parents: 17 diff changeset	179 self.tv.png_folder_load_tiles(data.filepath('tiles'))
9 3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	180 self.tv.tga_load_level(data.filepath('level1.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	181 self.create_display()
40 678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	182
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	183 self.selected_tool = None
105 7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	184 self.animal_to_place = None
186 f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	185 self.sprite_cursor = None
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	186 self.chickens = set()
d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	187 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	188 self.buildings = []
40 678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	189 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	190 self.eggs = 0
139 1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	191 self.days = 0
79 8241386a1651 Add chicken counter Neil Muller <drnlmuller@gmail.com> parents: 77 diff changeset	192 self.killed_foxes = 0
52 0d4799866bcf Sell chickens and buy fences. Jeremy Thurgood <firxen@gmail.com> parents: 40 diff changeset	193 self.add_cash(constants.STARTING_CASH)
17 cbbc5da7708a Interaction with the game board. Jeremy Thurgood <firxen@gmail.com> parents: 14 diff changeset	194
67 9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	195 self.fix_buildings()
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	196
118 2c76ed47fc44 Remove chicken respawn at day start. Handle eaten chickens in henhouses better Neil Muller <drnlmuller@gmail.com> parents: 116 diff changeset	197 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	198
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	199 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	200 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	201
082868bea873 Refactor UI so that only a single gui.App is used. Pass all UI events via main_app. Change Toolbar table to use .td() everywhere. Move toolbar to top. Simon Cross <hodgestar@gmail.com> parents: 148 diff changeset	202 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	203 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	204 tbl = gui.Table()
5569430fd82e Display cleanup and rationalisation. Jeremy Thurgood <firxen@gmail.com> parents: 35 diff changeset	205 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	206 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	207 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	208 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	209 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	210 self.top_widget = tbl
14 d7f295c06a4b Split gameboard screen. Jeremy Thurgood <firxen@gmail.com> parents: 12 diff changeset	211
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	212 def update(self):
37 497b53b69280 Always update the vidwidget. Jeremy Thurgood <firxen@gmail.com> parents: 36 diff changeset	213 self.tvw.reupdate()
9 3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	214
3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	215 def loop(self):
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: 24 diff changeset	216 self.tv.loop()
9 3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	217
162 fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	218 def set_selected_tool(self, tool, cursor):
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	219 self.selected_tool = tool
200 67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	220 self.select_animal_to_place(None)
162 fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	221 if cursor:
fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	222 pygame.mouse.set_cursor(*cursor)
fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	223 else:
fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	224 pygame.mouse.set_cursor(*cursors.cursors['arrow'])
186 f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	225 if self.sprite_cursor:
f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	226 self.tv.sprites.remove(self.sprite_cursor)
f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	227 self.sprite_cursor = None
f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	228 if buildings.is_building(tool):
f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	229 self.sprite_cursor = sprite_cursor.SpriteCursor(tool.IMAGE, self.tv)
f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	230 self.tv.sprites.append(self.sprite_cursor)
162 fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	231
fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	232 def reset_cursor(self):
fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	233 pygame.mouse.set_cursor(*cursors.cursors['arrow'])
17 cbbc5da7708a Interaction with the game board. Jeremy Thurgood <firxen@gmail.com> parents: 14 diff changeset	234
186 f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	235 def update_sprite_cursor(self, e):
f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	236 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	237 self.sprite_cursor.set_pos(tile_pos)
f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	238
69 18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	239 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	240 """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	241 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	242 return False
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	243 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	244 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	245 return False
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	246 return True
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	247
17 cbbc5da7708a Interaction with the game board. Jeremy Thurgood <firxen@gmail.com> parents: 14 diff changeset	248 def use_tool(self, e):
189 37af9e5dd292 Use tool with left button, cancel tool with right button. Jeremy Thurgood <firxen@gmail.com> parents: 186 diff changeset	249 if e.button == 3: # Right button
37af9e5dd292 Use tool with left button, cancel tool with right button. Jeremy Thurgood <firxen@gmail.com> parents: 186 diff changeset	250 self.selected_tool = None
37af9e5dd292 Use tool with left button, cancel tool with right button. Jeremy Thurgood <firxen@gmail.com> parents: 186 diff changeset	251 self.reset_cursor()
37af9e5dd292 Use tool with left button, cancel tool with right button. Jeremy Thurgood <firxen@gmail.com> parents: 186 diff changeset	252 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	253 return
52 0d4799866bcf Sell chickens and buy fences. Jeremy Thurgood <firxen@gmail.com> parents: 40 diff changeset	254 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	255 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	256 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	257 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	258 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	259 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	260 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	261 self.buy_fence(self.tv.screen_to_tile(e.pos))
65 7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	262 elif self.selected_tool == constants.TOOL_SELL_BUILDING:
7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	263 self.sell_building(self.tv.screen_to_tile(e.pos))
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	264 elif self.selected_tool == constants.TOOL_SELL_EQUIPMENT:
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	265 self.sell_equipment(self.tv.screen_to_tile(e.pos))
131 4527e09dc620 Add lumberjacks. Simon Cross <hodgestar@gmail.com> parents: 128 diff changeset	266 elif self.selected_tool == constants.TOOL_LOGGING:
4527e09dc620 Add lumberjacks. Simon Cross <hodgestar@gmail.com> parents: 128 diff changeset	267 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	268 elif buildings.is_building(self.selected_tool):
65 7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	269 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	270 elif equipment.is_equipment(self.selected_tool):
48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	271 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	272
166 4aa800354b7c Rename get_chicken to get_outside_chicken. Simon Cross <hodgestar@gmail.com> parents: 165 diff changeset	273 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	274 for chick in self.chickens:
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	275 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	276 return chick
b8f64db0d39e Cleaned up buying and selling a bit. Jeremy Thurgood <firxen@gmail.com> parents: 52 diff changeset	277 return None
57 08665fa60345 Implement henhouses and henhouse adding. Simon Cross <hodgestar@gmail.com> parents: 54 diff changeset	278
105 7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	279 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	280 for building in self.buildings:
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	281 if building.covers(tile_pos):
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	282 return building
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	283 return None
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	284
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	285 def sell_chicken(self, tile_pos):
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	286
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	287 def do_sell(chicken):
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	288 if not chicken:
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	289 return False # sanity check
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	290 if len(self.chickens) == 1:
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	291 print "You can't sell your last chicken!"
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	292 return False
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	293 self.add_cash(constants.SELL_PRICE_CHICKEN)
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	294 sound.play_sound("sell-chicken.ogg")
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	295 self.remove_chicken(chicken)
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	296 return True
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	297
166 4aa800354b7c Rename get_chicken to get_outside_chicken. Simon Cross <hodgestar@gmail.com> parents: 165 diff changeset	298 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	299 if chick is None:
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	300 building = self.get_building(tile_pos)
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	301 if building and building.NAME in buildings.HENHOUSES:
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	302 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	303 return
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	304 do_sell(chick)
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	305
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	306
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	307 def sell_egg(self, tile_pos):
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	308 def do_sell(chicken):
193 db246683d5da Selling eggs now works Neil Muller <drnlmuller@gmail.com> parents: 192 diff changeset	309 if chicken.egg:
db246683d5da Selling eggs now works Neil Muller <drnlmuller@gmail.com> parents: 192 diff changeset	310 # We sell the egg
194 5ec222ca07cd Selling eggs at the right price Neil Muller <drnlmuller@gmail.com> parents: 193 diff changeset	311 self.add_cash(constants.SELL_PRICE_EGG)
193 db246683d5da Selling eggs now works Neil Muller <drnlmuller@gmail.com> parents: 192 diff changeset	312 sound.play_sound("sell-chicken.ogg")
db246683d5da Selling eggs now works Neil Muller <drnlmuller@gmail.com> parents: 192 diff changeset	313 chicken.egg = None
db246683d5da Selling eggs now works Neil Muller <drnlmuller@gmail.com> parents: 192 diff changeset	314 self.eggs -= 1
db246683d5da Selling eggs now works Neil Muller <drnlmuller@gmail.com> parents: 192 diff changeset	315 self.toolbar.update_egg_counter(self.eggs)
db246683d5da Selling eggs now works Neil Muller <drnlmuller@gmail.com> parents: 192 diff changeset	316 # Force update
db246683d5da Selling eggs now works Neil Muller <drnlmuller@gmail.com> parents: 192 diff changeset	317 self.toolbar.chsize()
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	318 return False
193 db246683d5da Selling eggs now works Neil Muller <drnlmuller@gmail.com> parents: 192 diff changeset	319
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	320 building = self.get_building(tile_pos)
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	321 if building and building.NAME in buildings.HENHOUSES:
193 db246683d5da Selling eggs now works Neil Muller <drnlmuller@gmail.com> parents: 192 diff changeset	322 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	323
200 67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	324 def select_animal_to_place(self, animal):
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	325 if self.animal_to_place:
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	326 self.animal_to_place.unequip_by_name("spotlight")
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	327 self.animal_to_place = animal
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	328 if self.animal_to_place:
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	329 self.animal_to_place.equip(equipment.Spotlight())
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	330
105 7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	331 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	332 """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	333
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	334 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	335 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	336 """
166 4aa800354b7c Rename get_chicken to get_outside_chicken. Simon Cross <hodgestar@gmail.com> parents: 165 diff changeset	337 chicken = self.get_outside_chicken(tile_pos)
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	338 if chicken:
108 437cbd856a03 Add occupants and abodes. Allowing moving chickens around. Simon Cross <hodgestar@gmail.com> parents: 105 diff changeset	339 if chicken is self.animal_to_place:
200 67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	340 self.select_animal_to_place(None)
165 c7d496556475 Minor cursor bugfixes Neil Muller <drnlmuller@gmail.com> parents: 164 diff changeset	341 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	342 else:
200 67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	343 self.select_animal_to_place(chicken)
162 fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	344 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	345 return
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	346 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	347 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	348 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	349 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	350 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	351 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	352 self.animal_to_place.equip(equipment.Nest())
200 67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	353 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	354 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	355 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	356 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	357 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	358 self.open_building_dialog(building)
108 437cbd856a03 Add occupants and abodes. Allowing moving chickens around. Simon Cross <hodgestar@gmail.com> parents: 105 diff changeset	359 return
437cbd856a03 Add occupants and abodes. Allowing moving chickens around. Simon Cross <hodgestar@gmail.com> parents: 105 diff changeset	360 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	361 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	362 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	363 self.relocate_animal(self.animal_to_place, tile_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	364
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	365 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	366 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	367 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	368 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	369 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	370 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	371 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	372 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	373 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	374 self.set_visibility(chicken)
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	375
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	376 def set_visibility(self, chicken):
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	377 if chicken.outside():
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	378 if chicken not in self.tv.sprites:
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	379 self.tv.sprites.append(chicken)
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	380 else:
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	381 if chicken in self.tv.sprites:
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	382 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	383
170 92d11e0544bc Switch building to selected image when building is selected. Simon Cross <hodgestar@gmail.com> parents: 169 diff changeset	384 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	385 """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	386 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	387
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	388 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	389 self.disp.close(tbl)
170 92d11e0544bc Switch building to selected image when building is selected. Simon Cross <hodgestar@gmail.com> parents: 169 diff changeset	390 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	391 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	392
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	393 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	394 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	395
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	396 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	397 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	398 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	399 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	400 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	401 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	402
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	403 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	404 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	405
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	406 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	407 """Create dialog for manipulating the contents of a building."""
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	408 def select_occupant(place, button, sell_callback):
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	409 """Select occupant in place."""
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	410 # 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	411 # occupant
200 67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	412 self.select_animal_to_place(place.occupant)
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	413 if not sell_callback:
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	414 pygame.mouse.set_cursor(*cursors.cursors['chicken'])
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	415 else:
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	416 # Attempt to sell the occupant
200 67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	417 self.select_animal_to_place(None)
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	418 if sell_callback(place.occupant):
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	419 button.value = icons.EMPTY_NEST_ICON
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	420 button.disconnect(gui.CLICK, select_occupant)
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	421 button.connect(gui.CLICK, set_occupant, place, button,
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	422 sell_callback)
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	423
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	424 def set_occupant(place, button, sell_callback):
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	425 """Set occupant of a given place."""
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	426 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	427 button.value = icons.animal_icon(self.animal_to_place)
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	428 button.disconnect(gui.CLICK, set_occupant)
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	429 button.connect(gui.CLICK, select_occupant, place, button,
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	430 sell_callback)
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	431
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	432 old_abode = self.animal_to_place.abode
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	433 if id(old_abode) in place_button_map:
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	434 old_button = place_button_map[id(old_abode)]
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	435 old_button.value = icons.EMPTY_NEST_ICON
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	436 old_button.disconnect(gui.CLICK, select_occupant)
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	437 old_button.connect(gui.CLICK, set_occupant, place, button,
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	438 sell_callback)
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	439
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	440 self.relocate_animal(self.animal_to_place, place=place)
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	441
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	442 place_button_map = {}
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	443
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	444 tbl = gui.Table()
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	445 columns = building.max_floor_width()
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	446 kwargs = { 'style': { 'padding_left': 10, 'padding_bottom': 10 }}
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	447 for floor in building.floors():
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	448 tbl.tr()
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	449 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	450 tbl.tr()
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	451 for row in floor.rows():
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	452 tbl.tr()
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	453 for place in row:
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	454 if place.occupant is None:
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	455 button = gui.Button(icons.EMPTY_NEST_ICON)
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	456 button.connect(gui.CLICK, set_occupant, place, button,
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	457 sell_callback)
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	458 else:
201 fe1e9c18d4d7 layering bugfix; indoor chickens now use normal chicken icons Adrianna Pińska <adrianna.pinska@gmail.com> parents: 200 diff changeset	459 button = gui.Button(icons.animal_icon(place.occupant))
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	460 button.connect(gui.CLICK, select_occupant, place, button,
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	461 sell_callback)
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	462 place_button_map[id(place)] = button
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	463 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	464
170 92d11e0544bc Switch building to selected image when building is selected. Simon Cross <hodgestar@gmail.com> parents: 169 diff changeset	465 building.selected(True)
92d11e0544bc Switch building to selected image when building is selected. Simon Cross <hodgestar@gmail.com> parents: 169 diff changeset	466 def close_callback():
92d11e0544bc Switch building to selected image when building is selected. Simon Cross <hodgestar@gmail.com> parents: 169 diff changeset	467 building.selected(False)
92d11e0544bc Switch building to selected image when building is selected. Simon Cross <hodgestar@gmail.com> parents: 169 diff changeset	468
92d11e0544bc Switch building to selected image when building is selected. Simon Cross <hodgestar@gmail.com> parents: 169 diff changeset	469 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	470
54 b8f64db0d39e Cleaned up buying and selling a bit. Jeremy Thurgood <firxen@gmail.com> parents: 52 diff changeset	471 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	472 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	473 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	474 return
77 65958516c7d9 Implement separate fence repair cost (currently 25 groats). Simon Cross <hodgestar@gmail.com> parents: 73 diff changeset	475 if this_tile == self.GRASSLAND:
65958516c7d9 Implement separate fence repair cost (currently 25 groats). Simon Cross <hodgestar@gmail.com> parents: 73 diff changeset	476 cost = constants.BUY_PRICE_FENCE
65958516c7d9 Implement separate fence repair cost (currently 25 groats). Simon Cross <hodgestar@gmail.com> parents: 73 diff changeset	477 else:
65958516c7d9 Implement separate fence repair cost (currently 25 groats). Simon Cross <hodgestar@gmail.com> parents: 73 diff changeset	478 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	479 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	480 return
3c80f49d7d74 Don't allow buildings and fences to be built on top of chickens. Simon Cross <hodgestar@gmail.com> parents: 189 diff changeset	481
77 65958516c7d9 Implement separate fence repair cost (currently 25 groats). Simon Cross <hodgestar@gmail.com> parents: 73 diff changeset	482 if self.cash < cost:
54 b8f64db0d39e Cleaned up buying and selling a bit. Jeremy Thurgood <firxen@gmail.com> parents: 52 diff changeset	483 print "You can't afford a fence."
b8f64db0d39e Cleaned up buying and selling a bit. Jeremy Thurgood <firxen@gmail.com> parents: 52 diff changeset	484 return
77 65958516c7d9 Implement separate fence repair cost (currently 25 groats). Simon Cross <hodgestar@gmail.com> parents: 73 diff changeset	485 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	486 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	487
edc15ce8fa30 Implement fence selling (a bit hackish, but fine for now). Simon Cross <hodgestar@gmail.com> parents: 65 diff changeset	488 def sell_fence(self, tile_pos):
edc15ce8fa30 Implement fence selling (a bit hackish, but fine for now). Simon Cross <hodgestar@gmail.com> parents: 65 diff changeset	489 if self.tv.get(tile_pos) != self.FENCE:
edc15ce8fa30 Implement fence selling (a bit hackish, but fine for now). Simon Cross <hodgestar@gmail.com> parents: 65 diff changeset	490 return
edc15ce8fa30 Implement fence selling (a bit hackish, but fine for now). Simon Cross <hodgestar@gmail.com> parents: 65 diff changeset	491 self.add_cash(constants.SELL_PRICE_FENCE)
edc15ce8fa30 Implement fence selling (a bit hackish, but fine for now). Simon Cross <hodgestar@gmail.com> parents: 65 diff changeset	492 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	493
131 4527e09dc620 Add lumberjacks. Simon Cross <hodgestar@gmail.com> parents: 128 diff changeset	494 def logging_forest(self, tile_pos):
4527e09dc620 Add lumberjacks. Simon Cross <hodgestar@gmail.com> parents: 128 diff changeset	495 if self.tv.get(tile_pos) != self.WOODLAND:
4527e09dc620 Add lumberjacks. Simon Cross <hodgestar@gmail.com> parents: 128 diff changeset	496 return
135 149822fbebeb Check that there is enough cash before logging. Simon Cross <hodgestar@gmail.com> parents: 131 diff changeset	497 if self.cash < constants.LOGGING_PRICE:
149822fbebeb Check that there is enough cash before logging. Simon Cross <hodgestar@gmail.com> parents: 131 diff changeset	498 return
131 4527e09dc620 Add lumberjacks. Simon Cross <hodgestar@gmail.com> parents: 128 diff changeset	499 self.add_cash(-constants.LOGGING_PRICE)
4527e09dc620 Add lumberjacks. Simon Cross <hodgestar@gmail.com> parents: 128 diff changeset	500 self.tv.set(tile_pos, self.GRASSLAND)
4527e09dc620 Add lumberjacks. Simon Cross <hodgestar@gmail.com> parents: 128 diff changeset	501
65 7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	502 def buy_building(self, tile_pos, building_cls):
7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	503 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	504 if self.cash < building.buy_price():
57 08665fa60345 Implement henhouses and henhouse adding. Simon Cross <hodgestar@gmail.com> parents: 54 diff changeset	505 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	506 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	507 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	508 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	509 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	510 self.add_building(building)
60 e2631c8e2cd6 Implement guard towers (with temporary sprite PNG). Simon Cross <hodgestar@gmail.com> parents: 57 diff changeset	511
109 48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	512 def buy_equipment(self, tile_pos, equipment_cls):
166 4aa800354b7c Rename get_chicken to get_outside_chicken. Simon Cross <hodgestar@gmail.com> parents: 165 diff changeset	513 chicken = self.get_outside_chicken(tile_pos)
109 48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	514 equipment = equipment_cls()
48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	515 if chicken is None or self.cash < equipment.buy_price():
48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	516 return
48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	517 if equipment.place(chicken):
48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	518 self.add_cash(-equipment.buy_price())
48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	519 chicken.equip(equipment)
48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	520
65 7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	521 def sell_building(self, tile_pos):
66 edc15ce8fa30 Implement fence selling (a bit hackish, but fine for now). Simon Cross <hodgestar@gmail.com> parents: 65 diff changeset	522 if self.tv.get(tile_pos) == self.FENCE:
edc15ce8fa30 Implement fence selling (a bit hackish, but fine for now). Simon Cross <hodgestar@gmail.com> parents: 65 diff changeset	523 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	524 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	525 if building is None:
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	526 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	527 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	528 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	529 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	530 return
105 7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	531 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	532 building.remove(self.tv)
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	533 self.remove_building(building)
65 7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	534
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	535 def sell_equipment(self, tile_pos):
166 4aa800354b7c Rename get_chicken to get_outside_chicken. Simon Cross <hodgestar@gmail.com> parents: 165 diff changeset	536 chicken = self.get_outside_chicken(tile_pos)
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	537 if chicken is None or not chicken.equipment:
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	538 return
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	539 if len(chicken.equipment) == 1:
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	540 item = chicken.equipment[0]
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	541 self.add_cash(item.sell_price())
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	542 chicken.unequip(item)
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	543 else:
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	544 self.open_equipment_dialog(chicken)
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	545
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	546 def open_equipment_dialog(self, chicken):
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	547 tbl = gui.Table()
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	548
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	549 def sell_item(item, button):
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	550 """Select item of equipment."""
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	551 self.add_cash(item.sell_price())
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	552 chicken.unequip(item)
169 946f09ed37cd Make equipment dialog close after selecting an item to sell. Simon Cross <hodgestar@gmail.com> parents: 168 diff changeset	553 self.disp.close(dialog)
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	554
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	555 kwargs = { 'style': { 'padding_left': 10, 'padding_bottom': 10 }}
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	556
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	557 tbl.tr()
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	558 tbl.td(gui.Button("Sell ... "), align=-1, **kwargs)
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	559
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	560 for item in chicken.equipment:
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	561 tbl.tr()
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	562 button = gui.Button(item.name().title())
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	563 button.connect(gui.CLICK, sell_item, item, button)
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	564 tbl.td(button, align=1, **kwargs)
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	565
169 946f09ed37cd Make equipment dialog close after selecting an item to sell. Simon Cross <hodgestar@gmail.com> parents: 168 diff changeset	566 dialog = self.open_dialog(tbl)
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	567
14 d7f295c06a4b Split gameboard screen. Jeremy Thurgood <firxen@gmail.com> parents: 12 diff changeset	568 def event(self, e):
39 ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	569 if e.type == KEYDOWN:
ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	570 if e.key == K_UP:
ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	571 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	572 if e.key == K_DOWN:
ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	573 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	574 if e.key == K_LEFT:
ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	575 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	576 if e.key == K_RIGHT:
ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	577 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	578 else:
ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	579 self.disp.event(e)
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: 24 diff changeset	580
139 1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	581 def advance_day(self):
1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	582 self.days += 1
1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	583 self.toolbar.update_day_counter(self.days)
1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	584
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: 24 diff changeset	585 def clear_foxes(self):
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	586 for fox in self.foxes.copy():
80 ad9d1bc7ef0c Kill foxes that don't reach safety Neil Muller <drnlmuller@gmail.com> parents: 79 diff changeset	587 # 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	588 # killed
ad9d1bc7ef0c Kill foxes that don't reach safety Neil Muller <drnlmuller@gmail.com> parents: 79 diff changeset	589 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	590 != self.WOODLAND:
84 5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	591 self.kill_fox(fox)
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	592 else:
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	593 self.tv.sprites.remove(fox)
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	594 self.foxes = set() # Remove all the foxes
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: 24 diff changeset	595
29 2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	596 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	597 """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	598
d2b19131d537 Don't continue the night if we're not doing anything anymore Neil Muller <drnlmuller@gmail.com> parents: 119 diff changeset	599 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	600 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	601 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	602 return True
d2b19131d537 Don't continue the night if we're not doing anything anymore Neil Muller <drnlmuller@gmail.com> parents: 119 diff changeset	603 over = True
29 2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	604 for fox in self.foxes:
2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	605 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	606 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	607 over = False
84 5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	608 for chicken in self.chickens:
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	609 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	610 return over
29 2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	611
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: 24 diff changeset	612 def add_chicken(self, chicken):
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	613 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	614 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	615 self.tv.sprites.append(chicken)
79 8241386a1651 Add chicken counter Neil Muller <drnlmuller@gmail.com> parents: 77 diff changeset	616 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	617
6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: 24 diff changeset	618 def add_fox(self, fox):
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	619 self.foxes.add(fox)
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: 24 diff changeset	620 self.tv.sprites.append(fox)
29 2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	621
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	622 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	623 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	624 self.tv.sprites.append(building)
60 e2631c8e2cd6 Implement guard towers (with temporary sprite PNG). Simon Cross <hodgestar@gmail.com> parents: 57 diff changeset	625
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	626 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	627 self.eggs = 0
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	628 for building in self.buildings:
144 a9b800b4175e Add define for henhouses & egg laying. Neil Muller <drnlmuller@gmail.com> parents: 139 diff changeset	629 if building.NAME in buildings.HENHOUSES:
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	630 for chicken in building.occupants():
d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	631 chicken.lay()
d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	632 if chicken.egg:
118 2c76ed47fc44 Remove chicken respawn at day start. Handle eaten chickens in henhouses better Neil Muller <drnlmuller@gmail.com> parents: 116 diff changeset	633 self.eggs += 1
2c76ed47fc44 Remove chicken respawn at day start. Handle eaten chickens in henhouses better Neil Muller <drnlmuller@gmail.com> parents: 116 diff changeset	634 self.toolbar.update_egg_counter(self.eggs)
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	635
d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	636 def hatch_eggs(self):
d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	637 for building in self.buildings:
144 a9b800b4175e Add define for henhouses & egg laying. Neil Muller <drnlmuller@gmail.com> parents: 139 diff changeset	638 if building.NAME in buildings.HENHOUSES:
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	639 for chicken in building.occupants():
d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	640 new_chick = chicken.hatch()
d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	641 if new_chick:
118 2c76ed47fc44 Remove chicken respawn at day start. Handle eaten chickens in henhouses better Neil Muller <drnlmuller@gmail.com> parents: 116 diff changeset	642 self.eggs -= 1
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	643 try:
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	644 building.add_occupant(new_chick)
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	645 self.add_chicken(new_chick)
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	646 except buildings.BuildingFullError:
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	647 print "Building full."
118 2c76ed47fc44 Remove chicken respawn at day start. Handle eaten chickens in henhouses better Neil Muller <drnlmuller@gmail.com> parents: 116 diff changeset	648 self.toolbar.update_egg_counter(self.eggs)
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	649
84 5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	650 def kill_fox(self, fox):
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	651 if fox in self.foxes:
174 ff168162974e armour gets damaged Adrianna Pińska <adrianna.pinska@gmail.com> parents: 172 diff changeset	652 if not fox.survive_damage():
158 baf857805867 armour works now Adrianna Pińska <adrianna.pinska@gmail.com> parents: 154 diff changeset	653 self.killed_foxes += 1
baf857805867 armour works now Adrianna Pińska <adrianna.pinska@gmail.com> parents: 154 diff changeset	654 self.toolbar.update_fox_counter(self.killed_foxes)
baf857805867 armour works now Adrianna Pińska <adrianna.pinska@gmail.com> parents: 154 diff changeset	655 self.add_cash(constants.SELL_PRICE_DEAD_FOX)
baf857805867 armour works now Adrianna Pińska <adrianna.pinska@gmail.com> parents: 154 diff changeset	656 self.remove_fox(fox)
84 5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	657
29 2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	658 def remove_fox(self, fox):
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	659 self.foxes.discard(fox)
d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	660 if fox in self.tv.sprites:
29 2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	661 self.tv.sprites.remove(fox)
2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	662
2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	663 def remove_chicken(self, chick):
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	664 self.chickens.discard(chick)
118 2c76ed47fc44 Remove chicken respawn at day start. Handle eaten chickens in henhouses better Neil Muller <drnlmuller@gmail.com> parents: 116 diff changeset	665 if chick.egg:
2c76ed47fc44 Remove chicken respawn at day start. Handle eaten chickens in henhouses better Neil Muller <drnlmuller@gmail.com> parents: 116 diff changeset	666 self.eggs -= 1
2c76ed47fc44 Remove chicken respawn at day start. Handle eaten chickens in henhouses better Neil Muller <drnlmuller@gmail.com> parents: 116 diff changeset	667 self.toolbar.update_egg_counter(self.eggs)
2c76ed47fc44 Remove chicken respawn at day start. Handle eaten chickens in henhouses better Neil Muller <drnlmuller@gmail.com> parents: 116 diff changeset	668 if chick.abode:
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	669 chick.abode.clear_occupant()
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	670 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	671 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	672 self.tv.sprites.remove(chick)
40 678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	673
65 7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	674 def remove_building(self, building):
7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	675 if building in self.buildings:
7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	676 self.buildings.remove(building)
7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	677 self.tv.sprites.remove(building)
7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	678
40 678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	679 def add_cash(self, amount):
678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	680 self.cash += amount
678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	681 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	682
118 2c76ed47fc44 Remove chicken respawn at day start. Handle eaten chickens in henhouses better Neil Muller <drnlmuller@gmail.com> parents: 116 diff changeset	683 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	684 """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	685 x, y = 0, 0
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	686 width, height = self.tv.size
118 2c76ed47fc44 Remove chicken respawn at day start. Handle eaten chickens in henhouses better Neil Muller <drnlmuller@gmail.com> parents: 116 diff changeset	687 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	688 if x < width:
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	689 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	690 else:
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	691 y += 1
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	692 if y >= height:
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	693 break
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	694 x = 0
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	695 continue
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	696 # 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	697 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	698 # Farmland
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	699 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	700 # 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	701 # easier
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	702 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	703 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	704 continue
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	705 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	706 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	707 continue
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	708 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	709 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	710 # Fence
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	711 roll = 10
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	712 if roll == 1:
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	713 # Create a chicken
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	714 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	715 self.add_chicken(chick)
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	716 x += 1
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	717
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	718 def spawn_foxes(self):
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	719 """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	720 # 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	721 x, y = 0, 0
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	722 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	723 new_foxes = random.randint(3, 7)
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	724 while len(self.foxes) < new_foxes:
73 f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	725 side = random.randint(0, 3)
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	726 if side == 0:
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	727 # top
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	728 y = -1
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	729 x = random.randint(-1, width)
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	730 elif side == 1:
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	731 # bottom
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	732 y = height
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	733 x = random.randint(-1, width)
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	734 elif side == 2:
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	735 # left
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	736 x = -1
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	737 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	738 else:
73 f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	739 x = width
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	740 y = random.randint(-1, height)
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	741 skip = False
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	742 for other_fox in self.foxes:
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	743 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	744 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	745 break
73 f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	746 if not skip:
92 bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	747 roll = random.randint(0, 10)
128 c5f07479592e Beware the ninja fox. Simon Cross <hodgestar@gmail.com> parents: 127 diff changeset	748 if roll < 8:
92 bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	749 fox = animal.Fox((x, y))
128 c5f07479592e Beware the ninja fox. Simon Cross <hodgestar@gmail.com> parents: 127 diff changeset	750 elif roll < 9:
c5f07479592e Beware the ninja fox. Simon Cross <hodgestar@gmail.com> parents: 127 diff changeset	751 fox = animal.NinjaFox((x, y))
92 bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	752 else:
bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	753 fox = animal.GreedyFox((x, y))
73 f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	754 self.add_fox(fox)
69 18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	755
67 9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	756 def fix_buildings(self):
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	757 """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	758 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	759
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	760 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	761 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	762 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	763
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	764 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	765 """
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	766 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	767
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	768 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	769 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	770 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	771 tile_pos = (x, y)
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	772 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	773 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	774 continue
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	775
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	776 covered = False
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	777 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	778 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	779 covered = True
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	780 break
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	781
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	782 if covered:
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	783 continue
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	784
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	785 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	786 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	787 building.remove(self.tv)
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	788 building.place(self.tv)
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	789 self.add_building(building)
139 1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	790
1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	791 def is_game_over(self):
1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	792 """Return true if we're complete"""
1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	793 if self.days > constants.TURN_LIMIT:
1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	794 return True
1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	795 if len(self.chickens) == 0:
1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	796 return True

Mercurial > rinkhals

annotate gamelib/gameboard.py @ 201:fe1e9c18d4d7