Merge branch 'master' of github.com:lvl2/avocados

avocado.py

@@ -16,11 +16,15 @@ class Avocado:
         self.pycard = self.image.get_rect()
 
         self.pycard.x = random.randint(0, self.screen_width)
-        self.pycard.y = random.randint(0, 50)
+        self.pycard.y = random.randint(20, 70)
         self.step_x = 10
         self.step_y = 10
         self.is_falling = True
 
+    def reset(self):
+        self.pycard.x = random.randint(0, self.screen_width)
+        self.pycard.y = random.randint(0, 50)
+
     def collides(self, click):
         """
         Checks whether this object collides with the given position

game.py

@@ -10,6 +10,7 @@ from pygame.locals import *
 from support.colors import *
 from interface import hud
 
+
 def main():
     pygame.init()
     pygame.display.set_caption('Pin the Avocados!')
@@ -18,7 +19,7 @@ def main():
     # Move this outside the main code?
     screen_width = 800
     screen_height = 600
-    screen = pygame.display.set_mode((screen_width,screen_height))
+    screen = pygame.display.set_mode((screen_width, screen_height))
     bg = BLACK
     desired_fps = 5
 
@@ -28,10 +29,11 @@ def main():
 
     score = 0
     time = 15
-    level = 1
+    level = 5
 
     running = True
     timeleft = time
+    avocados = []
     while running:
         time_passed = clock.tick(desired_fps)
         fps = clock.get_fps()
@@ -47,19 +49,19 @@ def main():
             displaytime = timeleft
 
         # Redraw the HUD
-        chud = my_hud.draw_hud(score, displaytime, round(fps,2))
+        chud = my_hud.draw_hud(score, displaytime, round(fps, 2))
-        screen.blit(chud, (10,10))
+        screen.blit(chud, (10, 10))
 
         # Initialize a number of avocados, depending on the level
-        avocados = []
+        if len(avocados) != level:
-        for i in range(0, level):
+            avocados = []
-            a = avocado.Avocado((screen_width, screen_height))
+            for i in range(0, level):
-            avocados.append(a)
+                a = avocado.Avocado((screen_width, screen_height))
+                avocados.append(a)
 
-        has_moved = False
         for a in avocados:
-            if a.move():
+            if not a.move():
-                has_moved = True
+                a.reset()
             screen.blit(a.image, a.pycard)
 
         # Catch events