- no changes are good changes?

avocado.py

@@ -5,7 +5,9 @@ from support import operations
 
 class Avocado:
 
-    def __init__(self, screen, color, size, select, sound=True, filename='img/AvoCado_0.png'):
+    def __init__(self, screen, color, size, target, sound=True, filename='img/AvoCado_0.png'):
+
+        # HELP please!!
         # We randomly decide whether we should instanciate or not
         # I'd rather just not return an instance,
         # but I don't know how to do that :(
@@ -14,14 +16,12 @@ class Avocado:
             self.has_been_pinned = False
             return None
 
-        print('New avocado is ' + ','.join(str(color)))
+        # Set up our instance variables
         self.screen = screen
         self.color = color
-        self.select = select
+        self.target = target
         self.screen_width, self.screen_height = screen.get_size()
-        self.x = random.randint(0, self.screen_width)
+        self.w, self.y = size
-        self.y = 0  # change this to start somewhere above the screen
-        self.w , self.y = size
 
         # Initialize the image
         self.i = pygame.image.load(filename).convert_alpha()
@@ -36,6 +36,9 @@ class Avocado:
         self.is_falling = True
         self.has_been_pinned = False
 
+    def updateTargetColor(self, targetColor):
+        self.target = targetColor
+
 
     def blitme(self):
         self.screen.blit(self.image, self.rect)
@@ -49,13 +52,15 @@ class Avocado:
     def isHit(self, click):
         """
         Checks whether this object collides with the given position
-        of a mouse-click
+        of a mouse-click. Return true is the correct color was hit and
+        false if it was the wrong one.
+        Just returns void if no avocado was hit
         """
         mousex, mousey = click
         if self.rect.left < mousex and self.rect.right > mousex and \
             self.rect.top < mousey and self.rect.bottom > mousey:
 
-            if self.color == self.select:
+            if self.color == self.target:
                 self.has_been_pinned = True
                 return True
             else:
@@ -93,6 +98,7 @@ class Avocado:
         else:
             pygame.mixer.music.set_volume(0.5)
 
+
     def playLevel(self,lvl=1):
         if not sound:
             return
@@ -104,11 +110,13 @@ class Avocado:
             pygame.mixer.music.load("""audio/level3.wav""")
         pygame.mixer.music.play()
 
+
     def fade(self):
         if not sound:
             return
         pygame.mixer.music.fadeout(3000)
 
+
     def loadClick(self):
         if not sound:
             return

game.py

@@ -3,7 +3,7 @@
 Avocados and stuff
 """
 
-import os, random, sys
+import os, random
 import pygame
 import avocado, lawyer
 from pygame.locals import *
@@ -11,130 +11,129 @@ from support.colors import *
 from interface import hud
 
 
-def initialize_screen():
+class TheGame:
-    displayInfo = pygame.display.Info()
-    zoom = 1.3
 
-    WIDTH = int(displayInfo.current_w / zoom)
+    def __init__(self):
-    HEIGHT = int(displayInfo.current_h / zoom)
+        """ foo """
-    return (WIDTH, HEIGHT)
+        self.colors = [BLUE, GREEN, RED, YELLOW]
 
 
-def main():
+    def initialize_screen(self):
-    pygame.init()
+        displayInfo = pygame.display.Info()
-    try:
+        zoom = 1.3
-        pygame.mixer.init()
+        WIDTH = int(displayInfo.current_w / zoom)
-        pygame.mixer.music.set_volume(0.5)
+        HEIGHT = int(displayInfo.current_h / zoom)
-        noSound = False
+        return (WIDTH, HEIGHT)
-    except:
-        print("Setting no sound :(")
-        noSound = True
-
-    pygame.display.set_caption('Pin Avo, the Cado!')
-    clock = pygame.time.Clock()
-
-    # initialize_screen() won't work for dualscreen
-    #size = initialize_screen()
-    size = (800, 600)
-    bg = pygame.image.load("img/background.png")
-    desired_fps = 10
-    font = pygame.font.Font(None, 40)
-
-    # I don't know, should we move this text out of the way?
-    game_over = font.render('GAME OVER', 0, RED)
-
-    # initialize the game canvas
-    screen = pygame.display.set_mode(size)
-
-    # initialize the HUD class and the lawyer
-    the_hud = hud.Hud(screen)
-    fullegast = lawyer.Lawyer(screen)
-
-    # Well, we want this to select between several colors, so we need a list
-    # of colors, right?
-    colors = [BLUE, GREEN, RED, YELLOW]
-    selected = random.randint(0, 3)
-    color = colors[selected]
-
-    score = 0
-    time = 15
-    level = 5
-
-    running = True
-    timeleft = time
-    avocados = []
-    while running:
-        time_passed = clock.tick(desired_fps)
-        fps = clock.get_fps()
-        if type(bg) is tuple:
-            screen.fill(bg)
-        else:
-            screen.blit(pygame.transform.scale(bg,(800,600)),(0,0))
 
 
-        # Let's add the lawyer and have him announce a color
+    def main(self):
+        pygame.init()
+        try:
+            pygame.mixer.init()
+            pygame.mixer.music.set_volume(0.5)
+            noSound = False
+        except:
+            print("Y U NO sound? :(")
+            noSound = True
+
+        pygame.display.set_caption('Pin Avo, the Cado!')
+        clock = pygame.time.Clock()
+
+        # initialize_screen() won't work for dualscreen
+        #size = initialize_screen()
+        size = (800, 600)
+        bg = pygame.image.load("img/background.png")
+        desired_fps = 10
+        font = pygame.font.Font(None, 40)
+
+        # I don't know, should we move this text out of the way?
+        game_over = font.render('GAME OVER', 0, RED)
+
+        # initialize the game canvas
+        screen = pygame.display.set_mode(size)
+
+        # initialize the HUD class and the lawyer
+        the_hud = hud.Hud(screen)
+        fullegast = lawyer.Lawyer(screen)
+
+        # Initial color
+        color = self.chooseRandomColor()
         fullegast.setColor(color)
-        fullegast.blitme()
 
-        timeleft -= time_passed / 1000
+        score = 0
-        timeleft = round(timeleft, 2)
+        time = timeleft = 15
+        level = 5
+
+        avocados = []
+        running = True
+        while running:
+
+            time_passed = clock.tick(desired_fps)
+            fps = clock.get_fps()
+            if type(bg) is tuple:
+                screen.fill(bg)
+            else:
+                screen.blit(pygame.transform.scale(bg,(800,600)),(0,0))
+
+            # Let's add the lawyer
+            fullegast.blitme()
+
+            timeleft -= time_passed / 1000
+            timeleft = round(timeleft, 2)
+            if timeleft <= 0:
+                screen_width, screen_height = size
+                screen.blit(game_over, (screen_width/3, screen_height/2))
+                displaytime = 'Timed out!'
+                pygame.display.flip()
+                continue
+            else:
+                displaytime = timeleft
 
-        if timeleft <= 0:
-            screen_width, screen_height = size
-            screen.blit(game_over, (screen_width/3, screen_height/2))
-            displaytime = 'Timed out!'
             # Redraw the HUD
             the_hud.draw_hud(score, displaytime, round(fps, 2))
-            pygame.display.flip()
+
+            # Initialize a number of avocados, depending on the level
+            avocados_in_game = len(avocados)
+            if avocados_in_game != level:
+                for i in range(avocados_in_game, level):
+                    avocolor = self.chooseRandomColor()
+                    avosize = (50, 50)   # should we randomize this?
+                    a = avocado.Avocado(screen, avocolor, avosize, color, noSound)
+                    avocados.append(a)
+
+            # Remove avocados from the list if they no longer exist
+            # E.g. have been pinned or fallen down
+            avocados[:] = [ x for x in avocados if x.exists() ]
+            for a in avocados:
+                a.updateTargetColor(color)
+                a.move()
+                a.blitme()
+
+            # Catch events
             for event in pygame.event.get():
+                # Collision detection
+                if event.type == MOUSEBUTTONDOWN:
+                    for avo in avocados:
+                        hit = avo.isHit(pygame.mouse.get_pos())
+                        if hit:
+                            score += 100
+                            color = self.chooseRandomColor()
+                            fullegast.setColor(color)
+                        elif hit == False:
+                            score -= 50
+
+                # Had enough of this?
                 if event.type == pygame.QUIT:
                     running = False
-            continue
-        else:
-            displaytime = timeleft
 
-        # Redraw the HUD
+            pygame.display.flip()
-        the_hud.draw_hud(score, displaytime, round(fps, 2))
 
-        # Initialize a number of avocados, depending on the level
-        avocados_in_game = len(avocados)
-        print(avocados_in_game)
-        if avocados_in_game != level:
-            for i in range(avocados_in_game, level):
-                avocolor = colors[random.randint(0, 3)]
-                avosize = (50, 50)   # should we randomize this?
-                a = avocado.Avocado(screen, avocolor, avosize, color, noSound)
-                avocados.append(a)
 
-        # Remove avocados from the list if they no longer exist
+    def chooseRandomColor(self):
-        # E.g. have been pinned or fallen down
+        selected = random.randint(0, 3)
-        avocados[:] = [ x for x in avocados if x.exists() ]
+        return self.colors[selected]
-        for a in avocados:
-            a.move()
-            a.blitme()
-
-        # Catch events
-        for event in pygame.event.get():
-            # Collision detection
-            if event.type == MOUSEBUTTONDOWN:
-                for avo in avocados:
-                    hit = avo.isHit(pygame.mouse.get_pos())
-                    if hit:
-                        score += 100
-                    elif hit == False:
-                        score -= 50
-            if event.type == MOUSEMOTION:
-                # implement pin who follows mouse here
-                pass
-
-            # Had enough of this?
-            if event.type == pygame.QUIT:
-                running = False
-                pygame.quit()
-                sys.exit()
-
-        pygame.display.flip()
 
 
 if __name__ == '__main__':
-    main()
+    game = TheGame()
+    game.main()