tuning the timing

3 files changed, 21 insertions, 14 deletions

diff --git a/NEWS b/NEWS
index 19de154..068c748 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+2
+
+* some animation to provide better feedback
+
 1
 
 * new project
diff --git a/po/Erikos.pot b/po/Erikos.pot
index 805390f..6659cde 100644
--- a/po/Erikos.pot
+++ b/po/Erikos.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-08 23:00+0000\n"
+"POT-Creation-Date: 2009-12-09 16:00+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,7 +27,8 @@ msgstr ""
 
 #: /home/walter/Desktop/simon/ErikosActivity.py:82
 #: /home/walter/Desktop/simon/ErikosActivity.py:168
-#: /home/walter/Desktop/simon/window.py:197
+#: /home/walter/Desktop/simon/window.py:196
+#: /home/walter/Desktop/simon/window.py:205
 msgid "Level"
 msgstr ""
 
diff --git a/window.py b/window.py
index 328dfe4..de7f787 100644
--- a/window.py
+++ b/window.py
@@ -133,7 +133,7 @@ def _stepper(sw,i,j):
                               sw.sound_files[sw.seq[i]])
              sw.timeout_id = gobject.timeout_add(1000,_stepper,sw,i+1,False)
          else:
-             sw.timeout_id = gobject.timeout_add(1000,_all_off,sw)
+             _dance(sw,[0,1,2,3],1,0)
      else:
          sw.timeout_id = gobject.timeout_add(1000,_stepper,sw,i,True)
 
@@ -189,7 +189,7 @@ def _button_release_cb(win, event, sw):
             if sw.seq[sw.counter] == i: # correct reponse
                 sw.counter += 1
                 if sw.counter == sw.level*2:
-                    gobject.timeout_add(1000, _dance, sw, i, 0)
+                    gobject.timeout_add(1000, _dance, sw, [i], 10, 0)
                     sw.counter = 0
                     sw.level += 1
                     sw.activity.level_label.set_text(
@@ -197,7 +197,7 @@ def _button_release_cb(win, event, sw):
                     if sw.level*2 < len(sw.seq):
                         gobject.timeout_add(3000, play_the_game, sw)
                     else: # game over
-                        gobject.timeout_add(2000, _flash, sw, 9, True)
+                        gobject.timeout_add(2000, _flash, sw, 7, True)
                         sw.playpushed = False
                         sw.level = 1
                         sw.seq = gen_seq(30)
@@ -221,16 +221,18 @@ def _all_on(sw):
 #
 # Do a little dance
 #
-def _dance(sw, i, n):
-    xo = [0,-10,10,0]
-    yo = [-10,0,0,10]
+def _dance(sw, dancelist, dist, n):
+    xo = [0,-dist,dist,0]
+    yo = [-dist,0,0,dist]
     if n < 10:
-        move(sw.buttons_off[i].spr,
-            (sw.buttons_off[i].spr.x+xo[i],sw.buttons_off[i].spr.y+yo[i]))
-        gobject.timeout_add(50,_dance,sw,i,n+1)
+        for i in dancelist:
+            move(sw.buttons_off[i].spr,
+                 (sw.buttons_off[i].spr.x+xo[i],sw.buttons_off[i].spr.y+yo[i]))
+        gobject.timeout_add(30,_dance,sw,dancelist,dist,n+1)
     else:
-        move(sw.buttons_off[i].spr,
-            (sw.buttons_off[i].spr.x-xo[i]*10,sw.buttons_off[i].spr.y-yo[i]*10))
+        for i in dancelist:
+            move(sw.buttons_off[i].spr, (sw.buttons_off[i].spr.x-xo[i]*10,
+                                         sw.buttons_off[i].spr.y-yo[i]*10))
 
 #
 # Flash
@@ -244,7 +246,7 @@ def _flash(sw, n, i):
         gobject.timeout_add(200,_flash,sw,n-1,False)
     else:
         _all_off(sw)
-        gobject.timeout_add(200,_flash,sw,n-1,True)
+        gobject.timeout_add(200,_flash,sw,n,True)
 
 #
 # Turn all the sprites dim