[Tuxletics-commits] tuxletics penguin.py,1.9,1.10 scores,1.6,1.7 snowballgame.py,1.31,1.32

[Tero K. <te...@us...>]

Update of /cvsroot/tuxletics/tuxletics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8368

Modified Files:
	penguin.py scores snowballgame.py 
Log Message:
Slipping improved and some animation fixes.

Index: snowballgame.py
===================================================================
RCS file: /cvsroot/tuxletics/tuxletics/snowballgame.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- snowballgame.py	17 Dec 2004 11:50:56 -0000	1.31
+++ snowballgame.py	17 Dec 2004 13:55:14 -0000	1.32
@@ -304,7 +304,7 @@
             else:
                 dy += 0.002 * FLIGHT_SPEED_FACTOR * FLIGHT_SPEED_FACTOR # gravity
 
-            self.penguin.set_visible_image( 12 )
+            self.penguin.set_visible_image( 13 )
             self.penguin.set_position(STAND_X - self.throw_behind_line, STAND_Y)
             self.ball.update(int(x), int(y), ground_level)
             self.render()
@@ -332,7 +332,6 @@
 
         hs = highscore.HighScore()
         hs.writeScoreToFile(self.players[0].name,int(self.flight_len))
-        #print int(self.flight_len)
 
         while self.phase==PHASE_RESULT:
             for event in pygame.event.get():
@@ -345,21 +344,20 @@
 
     def foul(self):
         print "FOUL!" # DEBUG
-        self.travelled += 1
 
         # Every 5th pixel, we change the penguin image. This seems to achieve
         # pretty good animation, but could perhaps be fine tuned.
         p_img = 13
-        print self.penguin.rect.left, " < ", self.rect.right
+        i = 1
         while (self.penguin.rect.left < self.rect.right):
-            self.show_text("Don't step on the ice!", self.rect.center)
-            self.p_sprite.update()
+            self.p_sprite.update(i)
             if not self.travelled % 5:
                 p_img += 1
+                print "p_img ", p_img # DEBUG
+                self.penguin.set_visible_image( p_img )
                 if p_img is 17:
                     p_img = 15
-                self.penguin.set_visible_image( p_img )
-                print "p_img ", p_img #DEBUG
+                i *= 1.3 # Sightly accelerating slide
                 self.render()
             self.travelled += 1
         self.start_event()
@@ -374,16 +372,16 @@
     def penguin_run(self, speed):
         # We move the penguin one pixel forward and add one to the distance
         # we've travelled.
-        self.p_sprite.update()
+        self.p_sprite.update(1)
         self.travelled += 1
 
         # Every 5th pixel, we change the penguin image. This seems to achieve
         # pretty good animation, but could perhaps be fine tuned.
         if not self.travelled % 5:
             self.penguin.image_id += 1
+            self.penguin.set_visible_image( self.penguin.image_id )
             if self.penguin.image_id is 7:
                 self.penguin.image_id = 3
-            self.penguin.set_visible_image( self.penguin.image_id )
 
         self.render()
 
@@ -439,6 +437,8 @@
         if self.phase == PHASE_RESULT:
             self.show_text("Press return to try again!", self.rect.center)
 
+        if self.phase == PHASE_FOUL:
+            self.show_text("Don't step on the ice!", self.rect.center)
         pygame.display.flip()
 
     def quit_event(self, event):

Index: penguin.py
===================================================================
RCS file: /cvsroot/tuxletics/tuxletics/penguin.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- penguin.py	17 Dec 2004 08:36:21 -0000	1.9
+++ penguin.py	17 Dec 2004 13:55:13 -0000	1.10
@@ -36,35 +36,40 @@
         self.image_id = 0
 
         # Load the running images to a list
-        for i in range(7):
+        # p_images[0-6]
+        for i in range(8):
             s = "snowballthrow/run%s.png" % (i+1, )
             img, rect = load_png(s)
             self.p_images.append(img)
             self.p_rects.append(rect)
             self.p_rects.append(rect)
+            print "p_images ", i, self.p_images[i] # DEBUG
 
         # Load the throwing images to a list
-        # From index 7
+        # p_images[7-12]
         for i in range(5):
             s = "snowballthrow/throw%s.png" % (i+1, )
             img, rect = load_png(s)
             self.p_images.append(img)
             self.p_rects.append(rect)
+            print "p_images ", i+8, self.p_images[i] # DEBUG
 
         # Load the standing_small image to a list
-        # Index 13
+        # p_images[13]
         for i in range(1):
             s = "snowballthrow/stand_small.png"
             img, rect = load_png(s)
             self.p_images.append(img)
             self.p_rects.append(rect)
+            print "p_images ", i+13, self.p_images[i] # DEBUG
 
         # Load the slipping images to a list
-        # From index 14
+        # p_images[14-17]
         for i in range(4):
             s = "snowballthrow/slip%s.png" % (i+1, )
             img, rect = load_png(s)
             self.p_images.append(img)
+            print "p_images ", i+14, self.p_images[i] # DEBUG
 
         self.reinit()
 
@@ -74,8 +79,8 @@
         # We need a new rect since we want to move it around
         self.rect = self.rect.move([40, 250])
 
-    def update(self):
-        self.rect.move_ip([1, 0])
+    def update(self, speed):
+        self.rect.move_ip([speed, 0])
 
 
     def set_visible_image(self, ind):

Index: scores
===================================================================
RCS file: /cvsroot/tuxletics/tuxletics/scores,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- scores	17 Dec 2004 11:50:56 -0000	1.6
+++ scores	17 Dec 2004 13:55:14 -0000	1.7
@@ -1,10 +1,10 @@
 sss447
 nnn446
 sss444
+ttt441
 sss438
+ttt437
 nnn433
 sss429
 ttt425
 sss422
-sss421
-nmn416