Mercurial > rinkhals
changeset 461:279caa00f3fa
exchange rate should be per tree, not per plank
| author | Adrianna Pińska <adrianna.pinska@gmail.com> |
|---|---|
| date | Mon, 23 Nov 2009 21:01:15 +0000 |
| parents | 7204c16ab64d |
| children | aba7f1439571 |
| files | gamelib/gameboard.py gamelib/toolbar.py |
| diffstat | 2 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/gamelib/gameboard.py Mon Nov 23 20:53:11 2009 +0000 +++ b/gamelib/gameboard.py Mon Nov 23 21:01:15 2009 +0000 @@ -841,6 +841,7 @@ return len([(x,y) for x in range(width) for y in range(height) if self.tv.get((x,y)) == self.WOODLAND]) def calculate_wood_groat_exchange_rate(self): + # per five planks width, height = self.tv.size sell_price = float(10*width*height)/self.trees_left() buy_price = sell_price*(1.1)
--- a/gamelib/toolbar.py Mon Nov 23 20:53:11 2009 +0000 +++ b/gamelib/toolbar.py Mon Nov 23 21:01:15 2009 +0000 @@ -141,7 +141,7 @@ doc.add(make_box('%d groats' % equip.SELL_PRICE)) doc.add(make_box('N/A')) doc.br(space[1]) - doc.add(make_box("Plank")) + doc.add(make_box("5 planks")) doc.add(make_box('%d groats' % self.gameboard.wood_buy_price)) doc.add(make_box('%d groats' % self.gameboard.wood_sell_price)) doc.add(make_box('N/A')) @@ -385,8 +385,8 @@ self.gameboard.set_cursor(cursors.cursors['arrow'], None) self.add_heading("Trade...") - self.add_tool("Buy (%s)" % self.gameboard.wood_buy_price, self.buy_wood) - self.add_tool("Sell (%s)" % self.gameboard.wood_sell_price, self.sell_wood) + self.add_tool("Buy 5 planks (%s)" % self.gameboard.wood_buy_price, self.buy_wood) + self.add_tool("Sell 5 planks (%s)" % self.gameboard.wood_sell_price, self.sell_wood) self.add_spacer(15) self.add_tool('Done', self.add_default_toolbar) @@ -397,10 +397,10 @@ def buy_wood(self): if self.gameboard.cash >= self.gameboard.wood_buy_price: - self.gameboard.add_wood(1) + self.gameboard.add_wood(5) self.gameboard.add_cash(-self.gameboard.wood_buy_price) def sell_wood(self): - if self.gameboard.wood > 0: - self.gameboard.add_wood(-1) + if self.gameboard.wood >= 5: + self.gameboard.add_wood(-5) self.gameboard.add_cash(self.gameboard.wood_sell_price)