diff options
author | Walter Bender <walter.bender@gmail.com> | 2011-10-03 13:54:48 (GMT) |
---|---|---|
committer | Walter Bender <walter.bender@gmail.com> | 2011-10-03 13:54:48 (GMT) |
commit | 38ba25d729878701a840ead7cfb859de00eb0277 (patch) | |
tree | d06bb1c0be8bd5ce29af6591fed6855a076e3841 /bounce.py | |
parent | 22405e5bfeaed73030a906ab5c2c43144f790eb2 (diff) |
added 7ths to HARD challenges
Diffstat (limited to 'bounce.py')
-rw-r--r-- | bounce.py | 21 |
1 files changed, 18 insertions, 3 deletions
@@ -22,7 +22,10 @@ MEDIUM = [('2/8', 0.25, 12), ('2/4', 0.5, 12), ('3/6', 0.5, 12), ('10/12', 5 / 6., 12), ('11/12', 11 / 12., 12)] HARD = [('2/5', 0.4, 10), ('4/5', 0.8, 10), ('3/5', 0.6, 10), ('1/10', 0.1, 10), ('1/5', 0.2, 10), ('5/10', 0.5, 10), - ('3/10', 0.3, 10), ('7/10', 0.7, 10), ('8/10', 0.8, 10)] + ('3/10', 0.3, 10), ('7/10', 0.7, 10), ('8/10', 0.8, 10), + ('2/7', 2 / 7., 14), ('4/7', 4 / 7., 14), ('3/7', 3 / 7., 14), + ('1/14', 1 / 14., 14), ('1/7', 1 / 7., 14), ('5/14', 5 / 14., 14), + ('3/14', 3 / 14., 14), ('7/14', 0.5, 14), ('8/14', 4 / 7., 14)] EXPERT = 100 # after many correct answers, don't segment the bar BAR_HEIGHT = 20 STEPS = 100. # number of time steps per bounce rise and fall @@ -160,17 +163,21 @@ class Bounce(): # divide into two segments self.bar = Sprite(self.sprites, 0, 0, _svg_str_to_pixbuf(self._gen_bar(2))) - # divide into twelve segments self.bar12 = Sprite(self.sprites, 0, 0, _svg_str_to_pixbuf(self._gen_bar(12))) # divide into ten segments self.bar10 = Sprite(self.sprites, 0, 0, _svg_str_to_pixbuf(self._gen_bar(10))) + # divide into fourteen segments + self.bar14 = Sprite(self.sprites, 0, 0, + _svg_str_to_pixbuf(self._gen_bar(14))) + hoffset = int((self.ball.rect[3] + self.bar.rect[3]) / 2) self.bar.move((int(self.ball.rect[2] / 2), self.height - hoffset)) self.bar12.move((int(self.ball.rect[2] / 2), self.height - hoffset)) self.bar10.move((int(self.ball.rect[2] / 2), self.height - hoffset)) + self.bar14.move((int(self.ball.rect[2] / 2), self.height - hoffset)) num = _svg_header(BAR_HEIGHT * self.scale, BAR_HEIGHT * self.scale, 1.0) + \ _svg_rect(BAR_HEIGHT * self.scale, @@ -280,14 +287,22 @@ class Bounce(): self.bar.set_layer(0) self.bar10.set_layer(-1) self.bar12.set_layer(-1) + self.bar14.set_layer(-1) elif self.challenges[n][2] == 12: # show twelve-segment bar self.bar.set_layer(-1) self.bar10.set_layer(-1) self.bar12.set_layer(0) - else: # show ten-segment bar + self.bar14.set_layer(-1) + elif self.challenges[n][2] == 10: # show ten-segment bar self.bar.set_layer(-1) self.bar10.set_layer(0) self.bar12.set_layer(-1) + self.bar14.set_layer(-1) + else: # show fourteen-segment bar + self.bar.set_layer(-1) + self.bar10.set_layer(-1) + self.bar12.set_layer(-1) + self.bar14.set_layer(0) def _test(self): ''' Test to see if we estimated correctly ''' |