Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWade Brainerd <wadetb@gmail.com>2009-11-28 16:26:15 (GMT)
committer Wade Brainerd <wadetb@gmail.com>2009-11-28 16:26:15 (GMT)
commit534ed87171a818031fa6d7f211f85d52c65fc5e1 (patch)
treee17ec12d33fe88d12750772c16b86455ba6b9d95
parent1bb5c94e461ec6465e8780ec873f7c5d05664a9d (diff)
Minor code cleanup
-rw-r--r--kitegame.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/kitegame.py b/kitegame.py
index 8109864..f1d5982 100644
--- a/kitegame.py
+++ b/kitegame.py
@@ -142,15 +142,13 @@ class KiteGame(gtk.VBox):
return
correct_keys = 0
- total_keys = 0
+ total_keys = len(self.key_hist)
t = time.time()
avg_key_time = 0
- for i in xrange(len(self.key_hist)):
- h = self.key_hist[i]
+ for h in self.key_hist[1:]:
if h[1]:
correct_keys += 1
- total_keys += 1
avg_key_time += t - h[0]
t = h[0]
@@ -160,9 +158,7 @@ class KiteGame(gtk.VBox):
wpm = 12.0 / avg_key_time
else:
wpm = 0
- #wpm = float(correct_keys) * 12.0 / 5.0
- #wpm = 12.0 / max(0.2, (t - self.correct_time))
wpm = self.wpm * 0.99 + wpm * 0.01
if int(wpm) != int(self.wpm):
self.queue_draw_score()
@@ -174,14 +170,12 @@ class KiteGame(gtk.VBox):
progress = float(total_keys) / 20.0
pct = wpm / 50.0
-# pct = pct * progress
oldkitey = self.kitey
newkitey = (self.bounds.height - 50 - KITE_SIZE/2) * (1.0 - pct)
if self.kitey is None:
self.kitey = newkitey
else:
- #self.kitey = newkitey #self.kitey * 0.5 + newkitey * 0.5
self.kitey += (newkitey - self.kitey) * 0.1
self.kitey += (self.kitey - oldkitey) * 0.5