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

avocado.py

@@ -104,11 +104,15 @@ class Avocado:
             if self.checkObstacle \
              and (self.rect.right < right and self.rect.left > left):
                 self.checkObstacle = False
+                # print(self.rect.bottom, top)
+                # if self.rect.bottom > top:
+                #     self.vy = -self.vy
 
             if self.checkObstacle \
              and ((self.rect.right > right and self.rect.left < right) \
              or (self.rect.left < left and self.rect.right > left)):
-                self.vx = -self.vx
+                if self.rect.bottom > top:
+                    self.vx = -self.vx
 
 
     def move(self):

crystal.py

@@ -12,11 +12,12 @@ class Crystal:
     def __init__(self, screen):
         self.screen = screen
         screen_width, screen_height = screen.get_size()
-        self.rect = self.screen.get_rect()
-        self.imageCenterX = self.rect.centerx
-        self.imageCenterY = self.rect.centery
+        screen_rect = self.screen.get_rect()
+        self.imageCenterX = screen_rect.centerx
+        self.imageCenterY = screen_rect.centery
         self.pos = (self.imageCenterX-100,self.imageCenterY-5,200,183)
 
+
     def getBoundaries(self):
         return self.pos
 

game.py

@@ -99,6 +99,7 @@ class TheGame:
             return
         pygame.mixer.music.fadeout(3000)
 
+
     def chooseRandomColor(self):
         selected = random.randint(0, 3)
         if len(self.last_colors) > 5: