rinkhals: gamelib/gameboard.py annotate

annotate gamelib/gameboard.py @ 215:85a5299caf4a

bugfix: deselect eaten chickens

author	Adrianna Pińska <adrianna.pinska@gmail.com>
date	Fri, 04 Sep 2009 22:01:20 +0000
parents	07b361ebd87f
children	962934b8c7dc

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)
202 3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	152 # Blit animation frames on top of the drawing
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	153 x, y = self.vid.view.x, self.vid.view.y
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	154 for anim in self.gameboard.animations:
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	155 anim.fix_pos(self.vid)
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	156 anim.irect.x = anim.rect.x - anim.shape.x
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	157 anim.irect.y = anim.rect.y - anim.shape.y
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	158 surface.blit(anim.image, (anim.irect.x - x, anim.irect.y - y))
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	159 # We don't store anim._irect, since we only update anims if the
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	160 # image changes, which kills irect
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	161
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	162 def update(self, surface):
202 3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	163 us = []
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	164 x, y = self.vid.view.x, self.vid.view.y
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	165 for anim in self.gameboard.animations[:]:
212 b999abd5993b Fix missed status flag in animations Neil Muller <drnlmuller@gmail.com> parents: 208 diff changeset	166 # We process removed animations 1st, so we redraw things correctly
202 3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	167 if anim.removed:
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	168 us.append(pygame.Rect(anim.irect.x - x, anim.irect.y - y,
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	169 anim.irect.width, anim.irect.height))
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	170 self.gameboard.animations.remove(anim)
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	171 # Flag the underlying tiles/sprites to be redrawn
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	172 self.vid.alayer[anim.pos.y][anim.pos.x]=1
212 b999abd5993b Fix missed status flag in animations Neil Muller <drnlmuller@gmail.com> parents: 208 diff changeset	173 self.vid.updates.append(anim.pos.to_tuple())
202 3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	174 us.extend(self.vid.update(surface))
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	175 for anim in self.gameboard.animations:
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	176 if anim.updated:
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	177 anim.fix_pos(self.vid)
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	178 # setimage has happened
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	179 anim.irect.x = anim.rect.x - anim.shape.x
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	180 anim.irect.y = anim.rect.y - anim.shape.y
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	181 surface.blit(anim.image, (anim.irect.x - x, anim.irect.y - y))
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	182 anim.updated = 0
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	183 us.append(pygame.Rect(anim.irect.x - x, anim.irect.y - y,
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	184 anim.irect.width, anim.irect.height))
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	185 return us
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	186
39 ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	187 def move_view(self, x, y):
ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	188 self.vid.view.move_ip((x, y))
ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	189
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	190 def event(self, e):
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	191 if e.type == MOUSEBUTTONDOWN:
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	192 self.gameboard.use_tool(e)
186 f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	193 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	194 self.gameboard.update_sprite_cursor(e)
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	195
8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	196
9 3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	197 class GameBoard(object):
3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	198 TILE_DIMENSIONS = (20, 20)
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	199 TOOLBAR_WIDTH = 140
9 3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	200
66 edc15ce8fa30 Implement fence selling (a bit hackish, but fine for now). Simon Cross <hodgestar@gmail.com> parents: 65 diff changeset	201 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	202 FENCE = tiles.REVERSE_TILE_MAP['fence']
79 8241386a1651 Add chicken counter Neil Muller <drnlmuller@gmail.com> parents: 77 diff changeset	203 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	204 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	205
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 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	207 self.disp = main_app
24 7584453f4944 Add support for PNG tiles. Simon Cross <hodgestar@gmail.com> parents: 17 diff changeset	208 self.tv = tiles.FarmVid()
9 3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	209 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	210 self.tv.png_folder_load_tiles(data.filepath('tiles'))
9 3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	211 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	212 self.create_display()
40 678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	213
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	214 self.selected_tool = None
105 7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	215 self.animal_to_place = None
186 f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	216 self.sprite_cursor = None
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	217 self.chickens = set()
d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	218 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	219 self.buildings = []
202 3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	220 self.animations = []
40 678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	221 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	222 self.eggs = 0
139 1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	223 self.days = 0
79 8241386a1651 Add chicken counter Neil Muller <drnlmuller@gmail.com> parents: 77 diff changeset	224 self.killed_foxes = 0
52 0d4799866bcf Sell chickens and buy fences. Jeremy Thurgood <firxen@gmail.com> parents: 40 diff changeset	225 self.add_cash(constants.STARTING_CASH)
17 cbbc5da7708a Interaction with the game board. Jeremy Thurgood <firxen@gmail.com> parents: 14 diff changeset	226
67 9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	227 self.fix_buildings()
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	228
118 2c76ed47fc44 Remove chicken respawn at day start. Handle eaten chickens in henhouses better Neil Muller <drnlmuller@gmail.com> parents: 116 diff changeset	229 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	230
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	231 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	232 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	233
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	234 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	235 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	236 tbl = gui.Table()
5569430fd82e Display cleanup and rationalisation. Jeremy Thurgood <firxen@gmail.com> parents: 35 diff changeset	237 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	238 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	239 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	240 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	241 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	242 self.top_widget = tbl
14 d7f295c06a4b Split gameboard screen. Jeremy Thurgood <firxen@gmail.com> parents: 12 diff changeset	243
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	244 def update(self):
37 497b53b69280 Always update the vidwidget. Jeremy Thurgood <firxen@gmail.com> parents: 36 diff changeset	245 self.tvw.reupdate()
9 3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	246
3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	247 def loop(self):
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: 24 diff changeset	248 self.tv.loop()
9 3b045083631e Basic game board logic. Jeremy Thurgood <firxen@gmail.com> parents: diff changeset	249
162 fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	250 def set_selected_tool(self, tool, cursor):
35 8f6c6a54a099 Fixed gameboard display. Jeremy Thurgood <firxen@gmail.com> parents: 29 diff changeset	251 self.selected_tool = tool
213 07b361ebd87f Ensure we clean up highlights, etc. Neil Muller <drnlmuller@gmail.com> parents: 212 diff changeset	252 if self.animal_to_place:
07b361ebd87f Ensure we clean up highlights, etc. Neil Muller <drnlmuller@gmail.com> parents: 212 diff changeset	253 # Clear any highlights
07b361ebd87f Ensure we clean up highlights, etc. Neil Muller <drnlmuller@gmail.com> parents: 212 diff changeset	254 self.animal_to_place.unequip_by_name("spotlight")
200 67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	255 self.select_animal_to_place(None)
203 653da96db572 Fixed dangling cursor sprite and did some TODO list maintenance. Jeremy Thurgood <firxen@gmail.com> parents: 202 diff changeset	256 sprite_curs = None
653da96db572 Fixed dangling cursor sprite and did some TODO list maintenance. Jeremy Thurgood <firxen@gmail.com> parents: 202 diff changeset	257 if buildings.is_building(tool):
653da96db572 Fixed dangling cursor sprite and did some TODO list maintenance. Jeremy Thurgood <firxen@gmail.com> parents: 202 diff changeset	258 sprite_curs = sprite_cursor.SpriteCursor(tool.IMAGE, self.tv)
653da96db572 Fixed dangling cursor sprite and did some TODO list maintenance. Jeremy Thurgood <firxen@gmail.com> parents: 202 diff changeset	259 self.set_cursor(cursor, sprite_curs)
653da96db572 Fixed dangling cursor sprite and did some TODO list maintenance. Jeremy Thurgood <firxen@gmail.com> parents: 202 diff changeset	260
653da96db572 Fixed dangling cursor sprite and did some TODO list maintenance. Jeremy Thurgood <firxen@gmail.com> parents: 202 diff changeset	261 def set_cursor(self, cursor=None, sprite_curs=None):
162 fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	262 if cursor:
fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	263 pygame.mouse.set_cursor(*cursor)
fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	264 else:
fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	265 pygame.mouse.set_cursor(*cursors.cursors['arrow'])
186 f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	266 if self.sprite_cursor:
f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	267 self.tv.sprites.remove(self.sprite_cursor)
f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	268 self.sprite_cursor = None
203 653da96db572 Fixed dangling cursor sprite and did some TODO list maintenance. Jeremy Thurgood <firxen@gmail.com> parents: 202 diff changeset	269 if sprite_curs:
653da96db572 Fixed dangling cursor sprite and did some TODO list maintenance. Jeremy Thurgood <firxen@gmail.com> parents: 202 diff changeset	270 self.sprite_cursor = sprite_curs
186 f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	271 self.tv.sprites.append(self.sprite_cursor)
213 07b361ebd87f Ensure we clean up highlights, etc. Neil Muller <drnlmuller@gmail.com> parents: 212 diff changeset	272
07b361ebd87f Ensure we clean up highlights, etc. Neil Muller <drnlmuller@gmail.com> parents: 212 diff changeset	273 def reset_states(self):
07b361ebd87f Ensure we clean up highlights, etc. Neil Muller <drnlmuller@gmail.com> parents: 212 diff changeset	274 """Clear current states (highlights, etc.)"""
07b361ebd87f Ensure we clean up highlights, etc. Neil Muller <drnlmuller@gmail.com> parents: 212 diff changeset	275 if self.animal_to_place:
07b361ebd87f Ensure we clean up highlights, etc. Neil Muller <drnlmuller@gmail.com> parents: 212 diff changeset	276 self.animal_to_place.unequip_by_name("spotlight")
07b361ebd87f Ensure we clean up highlights, etc. Neil Muller <drnlmuller@gmail.com> parents: 212 diff changeset	277 self.set_cursor()
17 cbbc5da7708a Interaction with the game board. Jeremy Thurgood <firxen@gmail.com> parents: 14 diff changeset	278
186 f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	279 def update_sprite_cursor(self, e):
f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	280 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	281 self.sprite_cursor.set_pos(tile_pos)
f06010d34cd3 Add sprite cursors for building placement. Simon Cross <hodgestar@gmail.com> parents: 183 diff changeset	282
69 18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	283 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	284 """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	285 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	286 return False
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	287 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	288 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	289 return False
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	290 return True
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	291
17 cbbc5da7708a Interaction with the game board. Jeremy Thurgood <firxen@gmail.com> parents: 14 diff changeset	292 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	293 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	294 self.selected_tool = None
203 653da96db572 Fixed dangling cursor sprite and did some TODO list maintenance. Jeremy Thurgood <firxen@gmail.com> parents: 202 diff changeset	295 self.set_cursor()
189 37af9e5dd292 Use tool with left button, cancel tool with right button. Jeremy Thurgood <firxen@gmail.com> parents: 186 diff changeset	296 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	297 return
52 0d4799866bcf Sell chickens and buy fences. Jeremy Thurgood <firxen@gmail.com> parents: 40 diff changeset	298 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	299 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	300 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	301 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	302 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	303 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	304 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	305 self.buy_fence(self.tv.screen_to_tile(e.pos))
65 7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	306 elif self.selected_tool == constants.TOOL_SELL_BUILDING:
7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	307 self.sell_building(self.tv.screen_to_tile(e.pos))
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	308 elif self.selected_tool == constants.TOOL_SELL_EQUIPMENT:
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	309 self.sell_equipment(self.tv.screen_to_tile(e.pos))
131 4527e09dc620 Add lumberjacks. Simon Cross <hodgestar@gmail.com> parents: 128 diff changeset	310 elif self.selected_tool == constants.TOOL_LOGGING:
4527e09dc620 Add lumberjacks. Simon Cross <hodgestar@gmail.com> parents: 128 diff changeset	311 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	312 elif buildings.is_building(self.selected_tool):
65 7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	313 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	314 elif equipment.is_equipment(self.selected_tool):
48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	315 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	316
166 4aa800354b7c Rename get_chicken to get_outside_chicken. Simon Cross <hodgestar@gmail.com> parents: 165 diff changeset	317 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	318 for chick in self.chickens:
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	319 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	320 return chick
b8f64db0d39e Cleaned up buying and selling a bit. Jeremy Thurgood <firxen@gmail.com> parents: 52 diff changeset	321 return None
57 08665fa60345 Implement henhouses and henhouse adding. Simon Cross <hodgestar@gmail.com> parents: 54 diff changeset	322
105 7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	323 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	324 for building in self.buildings:
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	325 if building.covers(tile_pos):
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	326 return building
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	327 return None
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	328
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	329 def sell_chicken(self, tile_pos):
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	330
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	331 def do_sell(chicken):
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	332 if not chicken:
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	333 return False # sanity check
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	334 if len(self.chickens) == 1:
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	335 print "You can't sell your last chicken!"
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	336 return False
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	337 self.add_cash(constants.SELL_PRICE_CHICKEN)
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	338 sound.play_sound("sell-chicken.ogg")
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	339 self.remove_chicken(chicken)
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	340 return True
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	341
166 4aa800354b7c Rename get_chicken to get_outside_chicken. Simon Cross <hodgestar@gmail.com> parents: 165 diff changeset	342 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	343 if chick is None:
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	344 building = self.get_building(tile_pos)
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	345 if building and building.NAME in buildings.HENHOUSES:
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	346 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	347 return
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	348 do_sell(chick)
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	349
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	350
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	351 def sell_egg(self, tile_pos):
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	352 def do_sell(chicken):
193 db246683d5da Selling eggs now works Neil Muller <drnlmuller@gmail.com> parents: 192 diff changeset	353 if chicken.egg:
db246683d5da Selling eggs now works Neil Muller <drnlmuller@gmail.com> parents: 192 diff changeset	354 # We sell the egg
194 5ec222ca07cd Selling eggs at the right price Neil Muller <drnlmuller@gmail.com> parents: 193 diff changeset	355 self.add_cash(constants.SELL_PRICE_EGG)
193 db246683d5da Selling eggs now works Neil Muller <drnlmuller@gmail.com> parents: 192 diff changeset	356 sound.play_sound("sell-chicken.ogg")
db246683d5da Selling eggs now works Neil Muller <drnlmuller@gmail.com> parents: 192 diff changeset	357 chicken.egg = None
db246683d5da Selling eggs now works Neil Muller <drnlmuller@gmail.com> parents: 192 diff changeset	358 self.eggs -= 1
db246683d5da Selling eggs now works Neil Muller <drnlmuller@gmail.com> parents: 192 diff changeset	359 self.toolbar.update_egg_counter(self.eggs)
db246683d5da Selling eggs now works Neil Muller <drnlmuller@gmail.com> parents: 192 diff changeset	360 # Force update
db246683d5da Selling eggs now works Neil Muller <drnlmuller@gmail.com> parents: 192 diff changeset	361 self.toolbar.chsize()
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	362 return False
193 db246683d5da Selling eggs now works Neil Muller <drnlmuller@gmail.com> parents: 192 diff changeset	363
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	364 building = self.get_building(tile_pos)
a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	365 if building and building.NAME in buildings.HENHOUSES:
193 db246683d5da Selling eggs now works Neil Muller <drnlmuller@gmail.com> parents: 192 diff changeset	366 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	367
200 67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	368 def select_animal_to_place(self, animal):
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	369 if self.animal_to_place:
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	370 self.animal_to_place.unequip_by_name("spotlight")
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	371 self.animal_to_place = animal
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	372 if self.animal_to_place:
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	373 self.animal_to_place.equip(equipment.Spotlight())
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	374
105 7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	375 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	376 """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	377
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	378 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	379 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	380 """
166 4aa800354b7c Rename get_chicken to get_outside_chicken. Simon Cross <hodgestar@gmail.com> parents: 165 diff changeset	381 chicken = self.get_outside_chicken(tile_pos)
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	382 if chicken:
108 437cbd856a03 Add occupants and abodes. Allowing moving chickens around. Simon Cross <hodgestar@gmail.com> parents: 105 diff changeset	383 if chicken is self.animal_to_place:
200 67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	384 self.select_animal_to_place(None)
165 c7d496556475 Minor cursor bugfixes Neil Muller <drnlmuller@gmail.com> parents: 164 diff changeset	385 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	386 else:
200 67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	387 self.select_animal_to_place(chicken)
162 fa57868123d7 Basic cursor support Neil Muller <drnlmuller@gmail.com> parents: 158 diff changeset	388 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	389 return
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	390 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	391 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	392 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	393 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	394 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	395 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	396 self.animal_to_place.equip(equipment.Nest())
200 67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 197 diff changeset	397 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	398 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	399 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	400 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	401 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	402 self.open_building_dialog(building)
108 437cbd856a03 Add occupants and abodes. Allowing moving chickens around. Simon Cross <hodgestar@gmail.com> parents: 105 diff changeset	403 return
437cbd856a03 Add occupants and abodes. Allowing moving chickens around. Simon Cross <hodgestar@gmail.com> parents: 105 diff changeset	404 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	405 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	406 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	407 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	408
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	409 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	410 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	411 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	412 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	413 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	414 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	415 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	416 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	417 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	418 self.set_visibility(chicken)
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	419
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	420 def set_visibility(self, chicken):
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	421 if chicken.outside():
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	422 if chicken not in self.tv.sprites:
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	423 self.tv.sprites.append(chicken)
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	424 else:
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	425 if chicken in self.tv.sprites:
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	426 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	427
170 92d11e0544bc Switch building to selected image when building is selected. Simon Cross <hodgestar@gmail.com> parents: 169 diff changeset	428 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	429 """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	430 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	431
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	432 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	433 self.disp.close(tbl)
170 92d11e0544bc Switch building to selected image when building is selected. Simon Cross <hodgestar@gmail.com> parents: 169 diff changeset	434 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	435 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	436
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	437 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	438 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	439
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	440 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	441 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	442 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	443 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	444 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	445 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	446
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	447 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	448 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	449
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	450 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	451 """Create dialog for manipulating the contents of a building."""
208 f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	452
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	453 place_button_map = {}
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	454
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	455 def update_button(animal, empty=False):
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	456 """Update a button image (either to the animal, or to empty)."""
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	457 if animal:
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	458 button = place_button_map.get(id(animal.abode))
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	459 if button:
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	460 if empty:
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	461 button.value = icons.EMPTY_NEST_ICON
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	462 else:
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	463 button.value = icons.animal_icon(animal)
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	464
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	465 def nest_clicked(place, button):
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	466 """Handle a nest being clicked."""
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	467 # 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	468 # occupant
208 f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	469 if place.occupant:
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	470 # there is an occupant, select or sell it
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	471 if not sell_callback:
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	472 old_animal = self.animal_to_place
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	473 self.select_animal_to_place(place.occupant)
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	474 # deselect old animal (on button)
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	475 update_button(old_animal)
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	476 # select new animal (on button)
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	477 update_button(self.animal_to_place)
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	478 else:
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	479 # Attempt to sell the occupant
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	480 if sell_callback(place.occupant):
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	481 # empty the nest (on button)
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	482 update_button(place.occupant, empty=True)
192 a490ee2ef446 Allow selling of chickens in henhouses Neil Muller <drnlmuller@gmail.com> parents: 191 diff changeset	483 else:
208 f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	484 # there is no occupant, attempt to fill the space
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	485 if self.animal_to_place is not None:
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	486 # empty old nest (on button)
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	487 update_button(self.animal_to_place, empty=True)
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	488 self.relocate_animal(self.animal_to_place, place=place)
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	489 # populate the new nest (on button)
f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	490 update_button(self.animal_to_place)
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	491
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	492 tbl = gui.Table()
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	493 columns = building.max_floor_width()
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	494 kwargs = { 'style': { 'padding_left': 10, 'padding_bottom': 10 }}
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	495 for floor in building.floors():
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	496 tbl.tr()
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	497 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	498 tbl.tr()
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	499 for row in floor.rows():
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	500 tbl.tr()
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	501 for place in row:
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	502 if place.occupant is None:
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	503 button = gui.Button(icons.EMPTY_NEST_ICON)
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	504 else:
201 fe1e9c18d4d7 layering bugfix; indoor chickens now use normal chicken icons Adrianna Pińska <adrianna.pinska@gmail.com> parents: 200 diff changeset	505 button = gui.Button(icons.animal_icon(place.occupant))
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	506 place_button_map[id(place)] = button
208 f82d17f99882 Fix bugs in clicking around inside buildings while moving chickens. Simon Cross <hodgestar@gmail.com> parents: 203 diff changeset	507 button.connect(gui.CLICK, nest_clicked, place, button)
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	508 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	509
170 92d11e0544bc Switch building to selected image when building is selected. Simon Cross <hodgestar@gmail.com> parents: 169 diff changeset	510 building.selected(True)
92d11e0544bc Switch building to selected image when building is selected. Simon Cross <hodgestar@gmail.com> parents: 169 diff changeset	511 def close_callback():
92d11e0544bc Switch building to selected image when building is selected. Simon Cross <hodgestar@gmail.com> parents: 169 diff changeset	512 building.selected(False)
92d11e0544bc Switch building to selected image when building is selected. Simon Cross <hodgestar@gmail.com> parents: 169 diff changeset	513
92d11e0544bc Switch building to selected image when building is selected. Simon Cross <hodgestar@gmail.com> parents: 169 diff changeset	514 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	515
54 b8f64db0d39e Cleaned up buying and selling a bit. Jeremy Thurgood <firxen@gmail.com> parents: 52 diff changeset	516 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	517 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	518 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	519 return
77 65958516c7d9 Implement separate fence repair cost (currently 25 groats). Simon Cross <hodgestar@gmail.com> parents: 73 diff changeset	520 if this_tile == self.GRASSLAND:
65958516c7d9 Implement separate fence repair cost (currently 25 groats). Simon Cross <hodgestar@gmail.com> parents: 73 diff changeset	521 cost = constants.BUY_PRICE_FENCE
65958516c7d9 Implement separate fence repair cost (currently 25 groats). Simon Cross <hodgestar@gmail.com> parents: 73 diff changeset	522 else:
65958516c7d9 Implement separate fence repair cost (currently 25 groats). Simon Cross <hodgestar@gmail.com> parents: 73 diff changeset	523 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	524 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	525 return
3c80f49d7d74 Don't allow buildings and fences to be built on top of chickens. Simon Cross <hodgestar@gmail.com> parents: 189 diff changeset	526
77 65958516c7d9 Implement separate fence repair cost (currently 25 groats). Simon Cross <hodgestar@gmail.com> parents: 73 diff changeset	527 if self.cash < cost:
54 b8f64db0d39e Cleaned up buying and selling a bit. Jeremy Thurgood <firxen@gmail.com> parents: 52 diff changeset	528 print "You can't afford a fence."
b8f64db0d39e Cleaned up buying and selling a bit. Jeremy Thurgood <firxen@gmail.com> parents: 52 diff changeset	529 return
77 65958516c7d9 Implement separate fence repair cost (currently 25 groats). Simon Cross <hodgestar@gmail.com> parents: 73 diff changeset	530 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	531 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	532
edc15ce8fa30 Implement fence selling (a bit hackish, but fine for now). Simon Cross <hodgestar@gmail.com> parents: 65 diff changeset	533 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	534 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	535 return
edc15ce8fa30 Implement fence selling (a bit hackish, but fine for now). Simon Cross <hodgestar@gmail.com> parents: 65 diff changeset	536 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	537 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	538
131 4527e09dc620 Add lumberjacks. Simon Cross <hodgestar@gmail.com> parents: 128 diff changeset	539 def logging_forest(self, tile_pos):
4527e09dc620 Add lumberjacks. Simon Cross <hodgestar@gmail.com> parents: 128 diff changeset	540 if self.tv.get(tile_pos) != self.WOODLAND:
4527e09dc620 Add lumberjacks. Simon Cross <hodgestar@gmail.com> parents: 128 diff changeset	541 return
135 149822fbebeb Check that there is enough cash before logging. Simon Cross <hodgestar@gmail.com> parents: 131 diff changeset	542 if self.cash < constants.LOGGING_PRICE:
149822fbebeb Check that there is enough cash before logging. Simon Cross <hodgestar@gmail.com> parents: 131 diff changeset	543 return
131 4527e09dc620 Add lumberjacks. Simon Cross <hodgestar@gmail.com> parents: 128 diff changeset	544 self.add_cash(-constants.LOGGING_PRICE)
4527e09dc620 Add lumberjacks. Simon Cross <hodgestar@gmail.com> parents: 128 diff changeset	545 self.tv.set(tile_pos, self.GRASSLAND)
4527e09dc620 Add lumberjacks. Simon Cross <hodgestar@gmail.com> parents: 128 diff changeset	546
65 7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	547 def buy_building(self, tile_pos, building_cls):
7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	548 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	549 if self.cash < building.buy_price():
57 08665fa60345 Implement henhouses and henhouse adding. Simon Cross <hodgestar@gmail.com> parents: 54 diff changeset	550 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	551 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	552 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	553 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	554 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	555 self.add_building(building)
60 e2631c8e2cd6 Implement guard towers (with temporary sprite PNG). Simon Cross <hodgestar@gmail.com> parents: 57 diff changeset	556
109 48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	557 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	558 chicken = self.get_outside_chicken(tile_pos)
109 48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	559 equipment = equipment_cls()
48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	560 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	561 return
48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	562 if equipment.place(chicken):
48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	563 self.add_cash(-equipment.buy_price())
48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	564 chicken.equip(equipment)
48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	565
65 7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	566 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	567 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	568 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	569 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	570 if building is None:
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	571 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	572 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	573 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	574 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	575 return
105 7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	576 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	577 building.remove(self.tv)
7910b4e01dba Add chicken moving tool and start of animal placement. Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	578 self.remove_building(building)
65 7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	579
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	580 def sell_equipment(self, tile_pos):
166 4aa800354b7c Rename get_chicken to get_outside_chicken. Simon Cross <hodgestar@gmail.com> parents: 165 diff changeset	581 chicken = self.get_outside_chicken(tile_pos)
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	582 if chicken is None or not chicken.equipment:
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	583 return
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	584 if len(chicken.equipment) == 1:
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	585 item = chicken.equipment[0]
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	586 self.add_cash(item.sell_price())
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	587 chicken.unequip(item)
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	588 else:
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	589 self.open_equipment_dialog(chicken)
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	590
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	591 def open_equipment_dialog(self, chicken):
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	592 tbl = gui.Table()
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	593
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	594 def sell_item(item, button):
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	595 """Select item of equipment."""
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	596 self.add_cash(item.sell_price())
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	597 chicken.unequip(item)
169 946f09ed37cd Make equipment dialog close after selecting an item to sell. Simon Cross <hodgestar@gmail.com> parents: 168 diff changeset	598 self.disp.close(dialog)
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	599
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	600 kwargs = { 'style': { 'padding_left': 10, 'padding_bottom': 10 }}
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	601
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	602 tbl.tr()
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	603 tbl.td(gui.Button("Sell ... "), align=-1, **kwargs)
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	604
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	605 for item in chicken.equipment:
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	606 tbl.tr()
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	607 button = gui.Button(item.name().title())
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	608 button.connect(gui.CLICK, sell_item, item, button)
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	609 tbl.td(button, align=1, **kwargs)
ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	610
169 946f09ed37cd Make equipment dialog close after selecting an item to sell. Simon Cross <hodgestar@gmail.com> parents: 168 diff changeset	611 dialog = self.open_dialog(tbl)
164 ab90040013a7 Implement equipment selling. Simon Cross <hodgestar@gmail.com> parents: 162 diff changeset	612
14 d7f295c06a4b Split gameboard screen. Jeremy Thurgood <firxen@gmail.com> parents: 12 diff changeset	613 def event(self, e):
39 ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	614 if e.type == KEYDOWN:
ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	615 if e.key == K_UP:
ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	616 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	617 if e.key == K_DOWN:
ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	618 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	619 if e.key == K_LEFT:
ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	620 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	621 if e.key == K_RIGHT:
ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	622 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	623 else:
ec79aabe2bf1 Scroll game window with arrow keys. Jeremy Thurgood <firxen@gmail.com> parents: 37 diff changeset	624 self.disp.event(e)
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: 24 diff changeset	625
139 1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	626 def advance_day(self):
1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	627 self.days += 1
1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	628 self.toolbar.update_day_counter(self.days)
1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	629
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: 24 diff changeset	630 def clear_foxes(self):
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	631 for fox in self.foxes.copy():
80 ad9d1bc7ef0c Kill foxes that don't reach safety Neil Muller <drnlmuller@gmail.com> parents: 79 diff changeset	632 # 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	633 # killed
ad9d1bc7ef0c Kill foxes that don't reach safety Neil Muller <drnlmuller@gmail.com> parents: 79 diff changeset	634 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	635 != self.WOODLAND:
84 5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	636 self.kill_fox(fox)
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	637 else:
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	638 self.tv.sprites.remove(fox)
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	639 self.foxes = set() # Remove all the foxes
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: 24 diff changeset	640
202 3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	641 def run_animations(self):
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	642 for anim in self.animations:
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	643 anim.animate()
3074784c93f4 Animation support Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	644
29 2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	645 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	646 """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	647
d2b19131d537 Don't continue the night if we're not doing anything anymore Neil Muller <drnlmuller@gmail.com> parents: 119 diff changeset	648 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	649 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	650 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	651 return True
d2b19131d537 Don't continue the night if we're not doing anything anymore Neil Muller <drnlmuller@gmail.com> parents: 119 diff changeset	652 over = True
29 2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	653 for fox in self.foxes:
2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	654 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	655 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	656 over = False
84 5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	657 for chicken in self.chickens:
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	658 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	659 return over
29 2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	660
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: 24 diff changeset	661 def add_chicken(self, chicken):
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	662 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	663 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	664 self.tv.sprites.append(chicken)
79 8241386a1651 Add chicken counter Neil Muller <drnlmuller@gmail.com> parents: 77 diff changeset	665 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	666
6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: 24 diff changeset	667 def add_fox(self, fox):
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	668 self.foxes.add(fox)
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: 24 diff changeset	669 self.tv.sprites.append(fox)
29 2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	670
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	671 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	672 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	673 self.tv.sprites.append(building)
60 e2631c8e2cd6 Implement guard towers (with temporary sprite PNG). Simon Cross <hodgestar@gmail.com> parents: 57 diff changeset	674
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	675 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	676 self.eggs = 0
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	677 for building in self.buildings:
144 a9b800b4175e Add define for henhouses & egg laying. Neil Muller <drnlmuller@gmail.com> parents: 139 diff changeset	678 if building.NAME in buildings.HENHOUSES:
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	679 for chicken in building.occupants():
d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	680 chicken.lay()
d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	681 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	682 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	683 self.toolbar.update_egg_counter(self.eggs)
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	684
d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	685 def hatch_eggs(self):
d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	686 for building in self.buildings:
144 a9b800b4175e Add define for henhouses & egg laying. Neil Muller <drnlmuller@gmail.com> parents: 139 diff changeset	687 if building.NAME in buildings.HENHOUSES:
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	688 for chicken in building.occupants():
d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	689 new_chick = chicken.hatch()
d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	690 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	691 self.eggs -= 1
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	692 try:
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	693 building.add_occupant(new_chick)
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	694 self.add_chicken(new_chick)
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	695 except buildings.BuildingFullError:
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	696 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	697 self.toolbar.update_egg_counter(self.eggs)
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	698
84 5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	699 def kill_fox(self, fox):
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	700 if fox in self.foxes:
174 ff168162974e armour gets damaged Adrianna Pińska <adrianna.pinska@gmail.com> parents: 172 diff changeset	701 if not fox.survive_damage():
158 baf857805867 armour works now Adrianna Pińska <adrianna.pinska@gmail.com> parents: 154 diff changeset	702 self.killed_foxes += 1
baf857805867 armour works now Adrianna Pińska <adrianna.pinska@gmail.com> parents: 154 diff changeset	703 self.toolbar.update_fox_counter(self.killed_foxes)
baf857805867 armour works now Adrianna Pińska <adrianna.pinska@gmail.com> parents: 154 diff changeset	704 self.add_cash(constants.SELL_PRICE_DEAD_FOX)
baf857805867 armour works now Adrianna Pińska <adrianna.pinska@gmail.com> parents: 154 diff changeset	705 self.remove_fox(fox)
84 5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 83 diff changeset	706
29 2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	707 def remove_fox(self, fox):
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	708 self.foxes.discard(fox)
d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	709 if fox in self.tv.sprites:
29 2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	710 self.tv.sprites.remove(fox)
2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	711
2e88c680672c Minimal fox raid logic Neil Muller <drnlmuller@gmail.com> parents: 25 diff changeset	712 def remove_chicken(self, chick):
215 85a5299caf4a bugfix: deselect eaten chickens Adrianna Pińska <adrianna.pinska@gmail.com> parents: 213 diff changeset	713 if chick is self.animal_to_place:
85a5299caf4a bugfix: deselect eaten chickens Adrianna Pińska <adrianna.pinska@gmail.com> parents: 213 diff changeset	714 self.select_animal_to_place(None)
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	715 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	716 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	717 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	718 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	719 if chick.abode:
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 124 diff changeset	720 chick.abode.clear_occupant()
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	721 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	722 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	723 self.tv.sprites.remove(chick)
40 678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	724
65 7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	725 def remove_building(self, building):
7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	726 if building in self.buildings:
7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	727 self.buildings.remove(building)
7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	728 self.tv.sprites.remove(building)
7e9c8ad06d32 Implement building selling. Simon Cross <hodgestar@gmail.com> parents: 64 diff changeset	729
40 678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	730 def add_cash(self, amount):
678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	731 self.cash += amount
678421bd58ee Money counter with very ugly display hack. Jeremy Thurgood <firxen@gmail.com> parents: 39 diff changeset	732 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	733
118 2c76ed47fc44 Remove chicken respawn at day start. Handle eaten chickens in henhouses better Neil Muller <drnlmuller@gmail.com> parents: 116 diff changeset	734 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	735 """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	736 x, y = 0, 0
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	737 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	738 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	739 if x < width:
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	740 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	741 else:
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	742 y += 1
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	743 if y >= height:
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	744 break
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	745 x = 0
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	746 continue
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	747 # 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	748 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	749 # Farmland
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	750 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	751 # 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	752 # easier
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	753 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	754 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	755 continue
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	756 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	757 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	758 continue
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	759 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	760 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	761 # Fence
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	762 roll = 10
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	763 if roll == 1:
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	764 # Create a chicken
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	765 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	766 self.add_chicken(chick)
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	767 x += 1
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	768
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	769 def spawn_foxes(self):
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	770 """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	771 # 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	772 x, y = 0, 0
18db99fda6bd Move spawing code from engine to gameboard - seems more natural. Neil Muller <drnlmuller@gmail.com> parents: 68 diff changeset	773 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	774 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	775 while len(self.foxes) < new_foxes:
73 f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	776 side = random.randint(0, 3)
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	777 if side == 0:
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	778 # top
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	779 y = -1
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	780 x = random.randint(-1, width)
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	781 elif side == 1:
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	782 # bottom
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	783 y = height
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	784 x = random.randint(-1, width)
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	785 elif side == 2:
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	786 # left
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	787 x = -1
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	788 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	789 else:
73 f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	790 x = width
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	791 y = random.randint(-1, height)
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	792 skip = False
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	793 for other_fox in self.foxes:
f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	794 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	795 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	796 break
73 f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	797 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	798 roll = random.randint(0, 10)
128 c5f07479592e Beware the ninja fox. Simon Cross <hodgestar@gmail.com> parents: 127 diff changeset	799 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	800 fox = animal.Fox((x, y))
128 c5f07479592e Beware the ninja fox. Simon Cross <hodgestar@gmail.com> parents: 127 diff changeset	801 elif roll < 9:
c5f07479592e Beware the ninja fox. Simon Cross <hodgestar@gmail.com> parents: 127 diff changeset	802 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	803 else:
bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	804 fox = animal.GreedyFox((x, y))
73 f3ce3346e25e Spawn foxes jsut outside the map Neil Muller <drnlmuller@gmail.com> parents: 69 diff changeset	805 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	806
67 9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	807 def fix_buildings(self):
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	808 """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	809 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	810
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	811 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	812 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	813 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	814
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	815 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	816 """
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	817 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	818
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	819 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	820 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	821 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	822 tile_pos = (x, y)
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	823 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	824 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	825 continue
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	826
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	827 covered = False
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	828 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	829 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	830 covered = True
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	831 break
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	832
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	833 if covered:
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	834 continue
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	835
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	836 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	837 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	838 building.remove(self.tv)
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	839 building.place(self.tv)
9171d9b9ab35 Sanity check and fix up buildings on map after loading. Simon Cross <hodgestar@gmail.com> parents: 66 diff changeset	840 self.add_building(building)
139 1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	841
1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	842 def is_game_over(self):
1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	843 """Return true if we're complete"""
1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	844 if self.days > constants.TURN_LIMIT:
1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	845 return True
1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	846 if len(self.chickens) == 0:
1d73de63bd71 Add basic game over screen Neil Muller <drnlmuller@gmail.com> parents: 135 diff changeset	847 return True

Mercurial > rinkhals

annotate gamelib/gameboard.py @ 215:85a5299caf4a