# HG changeset patch # User Jeremy Thurgood # Date 1336593029 -7200 # Node ID 069a2d34b8b536f1d4a9a31e346a412dfe32308a # Parent 50f8476aa929b66944d7823f350eeb8eb44b9315 I shall pretend I did not touch the GUI, even though I added a myriad copies of some extra widgets. diff -r 50f8476aa929 -r 069a2d34b8b5 gamelib/gamegui.py --- a/gamelib/gamegui.py Wed May 09 21:43:04 2012 +0200 +++ b/gamelib/gamegui.py Wed May 09 21:50:29 2012 +0200 @@ -193,7 +193,7 @@ '%s : 0' % description, font_medium, (255, 255, 0)) def set_value(self, value): - self.text = '%s : %d' % (self.description, value) + self.text = '%s : %s' % (self.description, value) self._draw_text() @@ -308,6 +308,11 @@ self.money = ValueLabel((310, 75), 'Money') self.add_child(self.money) + self.milestone = ValueLabel((10, 95), 'Currently taken over') + self.add_child(self.milestone) + self.reputation = ValueLabel((310, 95), 'Reputation') + self.add_child(self.reputation) + labbut = SwitchWinButton((150, 10), 'Research', lab) self.add_child(labbut) @@ -349,6 +354,8 @@ def update_labels(self): self.points.set_value(self.game.get_available_points()) self.money.set_value(self.game.money) + self.milestone.set_value(self.game.milestone) + self.reputation.set_value(self.game.reputation) def do_reset(self): self.lab.reset() @@ -389,6 +396,11 @@ self.money = ValueLabel((310, 75), 'Money') self.add_child(self.money) + self.milestone = ValueLabel((10, 95), 'Currently taken over') + self.add_child(self.milestone) + self.reputation = ValueLabel((310, 95), 'Reputation') + self.add_child(self.reputation) + labbut = SwitchWinButton((150, 10), 'Research', lab) self.add_child(labbut) self.activity = None @@ -437,6 +449,8 @@ def update_labels(self): self.points.set_value(self.game.get_available_points()) self.money.set_value(self.game.money) + self.milestone.set_value(self.game.milestone) + self.reputation.set_value(self.game.reputation) def do_reset(self): self.reset() @@ -468,6 +482,11 @@ self.money = ValueLabel((310, 75), 'Money') self.add_child(self.money) + self.milestone = ValueLabel((10, 95), 'Currently taken over') + self.add_child(self.milestone) + self.reputation = ValueLabel((310, 95), 'Reputation') + self.add_child(self.reputation) + self.develop = DevelopmentWindow(screen, self) self.activity = ActivityWindow(screen, self, self.develop) self.develop.set_activity_window(self.activity) @@ -527,6 +546,8 @@ def update_labels(self): self.points.set_value(self.game.get_available_points()) self.money.set_value(self.game.money) + self.milestone.set_value(self.game.milestone) + self.reputation.set_value(self.game.reputation) def do_reset(self): self.reset()