From b1f54e9e7c16394176c7694d0b216e5dbe82d3a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Sun, 31 Aug 2014 11:49:02 +0200 Subject: [PATCH 1/2] Trick the random generator... --- game.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/game.py b/game.py index 291feed..b307862 100755 --- a/game.py +++ b/game.py @@ -29,6 +29,7 @@ class TheGame: self.bg = pygame.image.load(os.path.join('img', 'lawyerCrystalBall.png')) self.bg.set_colorkey((255,255,255)) self.bg.set_alpha(75) + self.last_colors = [] # fonts self.bigFont = pygame.font.Font(None, 90) @@ -93,9 +94,16 @@ class TheGame: def chooseRandomColor(self): selected = random.randint(0, 3) + if len(self.last_colors) > 5: + self.last_colors.pop(0) + for i in range(0, 5): + if selected in self.last_colors: + selected = random.randint(0, 3) + else: + break + self.last_colors.append(selected) return self.colors[selected] - def gameOver(self): screen_width, screen_height = self.screen.get_size() gameOverImage = pygame.image.load("img/gameOver.png") From e98f94575b43f9fdbef32e3134234b424e092d58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Sun, 31 Aug 2014 11:52:40 +0200 Subject: [PATCH 2/2] Fix issue wit color --- avocado.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/avocado.py b/avocado.py index bc34929..defcc3f 100644 --- a/avocado.py +++ b/avocado.py @@ -10,7 +10,7 @@ class Avocado: # Set up our instance variables self.screen = screen self.screen_width, self.screen_height = screen.get_size() - color = properties['color'] + self.color = properties['color'] self.w, self.y = properties['size'] self.target = target self.boundaries = boundaries @@ -18,7 +18,7 @@ class Avocado: # Initialize the image self.i = pygame.image.load(filename).convert_alpha() - operations.color_surface(self.i, color) + operations.color_surface(self.i, self.color) self.image = pygame.transform.scale(self.i, (self.w, self.y)) self.rect = self.image.get_rect()