Mercurial > sypikslang
changeset 67:06c8539df478
Tweak label handling. Show money as well
| author | Neil Muller <drnlmuller@gmail.com> |
|---|---|
| date | Tue, 08 May 2012 22:28:00 +0200 |
| parents | 43b34b013462 |
| children | 7309392d9ca9 |
| files | gamelib/gamegui.py |
| diffstat | 1 files changed, 33 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/gamelib/gamegui.py Tue May 08 22:04:11 2012 +0200 +++ b/gamelib/gamegui.py Tue May 08 22:28:00 2012 +0200 @@ -77,7 +77,7 @@ self.science.points, self.points) self._draw_text() self.parent.game.cur_allocation.append(self.science) - self.parent.update_points() + self.parent.update_labels() def reset(self): while self.points > 0: @@ -85,17 +85,19 @@ self.points -= 1 self.text = '%s: %d' % (self.science.NAME, self.science.points) self._draw_text() - self.parent.update_points() + self.parent.update_labels() -class PointsLabel(TextLabel): +class ValueLabel(TextLabel): - def __init__(self): - super(PointsLabel, self).__init__((10, 70, 300, 50), - 'Available Human Resources : 0', font_medium, (255, 255, 0)) + def __init__(self, pos, description): + self.description = description + rect = (pos[0], pos[1], 300, 50) + super(ValueLabel, self).__init__(rect, + '%s : 0' % description, font_medium, (255, 255, 0)) def set_value(self, value): - self.text = 'Available Human Resource : %d' % value + self.text = '%s : %d' % (self.description, value) self._draw_text() @@ -113,8 +115,10 @@ reset = ResetButton(self) self.add_child(reset) - self.points = PointsLabel() + self.points = ValueLabel((10, 75), 'Available Human Resources') self.add_child(self.points) + self.money = ValueLabel((310, 75), 'Money') + self.add_child(self.money) labbut = SwitchWinButton((150, 10), 'Research', lab) self.add_child(labbut) @@ -122,7 +126,7 @@ devbut = SwitchWinButton((300, 10), 'Development', develop) self.add_child(devbut) - self.update_points() + self.update_labels() self._make_widgets() def _make_widgets(self): @@ -139,10 +143,11 @@ pass def update(self): - self.update_points() + self.update_labels() - def update_points(self): + def update_labels(self): self.points.set_value(self.game.get_available_points()) + self.money.set_value(self.game.money) def do_reset(self): self.lab.reset() @@ -150,7 +155,7 @@ self.reset() def reset(self): - self.update_points() + self.update_labels() class DevelopmentWindow(Window): @@ -167,14 +172,16 @@ reset = ResetButton(self) self.add_child(reset) - self.points = PointsLabel() + self.points = ValueLabel((10, 75), 'Available Human Resources') self.add_child(self.points) + self.money = ValueLabel((310, 75), 'Money') + self.add_child(self.money) labbut = SwitchWinButton((150, 10), 'Research', lab) self.add_child(labbut) self.activity = None - self.update_points() + self.update_labels() self._sciences = [] self._make_science_widgets() @@ -211,13 +218,14 @@ self.remove_child(widget) self._sciences = [] self._make_science_widgets() - self.update_points() + self.update_labels() def update(self): - self.update_points() + self.update_labels() - def update_points(self): + def update_labels(self): self.points.set_value(self.game.get_available_points()) + self.money.set_value(self.game.money) def do_reset(self): self.reset() @@ -242,8 +250,10 @@ reset = ResetButton(self) self.add_child(reset) - self.points = PointsLabel() + self.points = ValueLabel((10, 75), 'Available Human Resources') self.add_child(self.points) + self.money = ValueLabel((310, 75), 'Money') + self.add_child(self.money) self.develop = DevelopmentWindow(screen, self) self.activity = ActivityWindow(screen, self, self.develop) @@ -257,7 +267,7 @@ self._sciences = [] # Setup for the first turn self.game.start_turn() - self.update_points() + self.update_labels() self._make_science_widgets() def _make_science_widgets(self): @@ -284,16 +294,17 @@ def end_turn(self): self.game.end_turn() self.game.start_turn() - self.update_points() + self.update_labels() self.update_widgets() self.develop.update_widgets() self.activity.update_widgets() def update(self): - self.update_points() + self.update_labels() - def update_points(self): + def update_labels(self): self.points.set_value(self.game.get_available_points()) + self.money.set_value(self.game.money) def do_reset(self): self.reset()