syn2cat
/
avocados
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

master
David Raison 2014-08-31 12:08:04 +02:00
parent 743d0994df e98f94575b
commit 16018b5c97
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
avocado.py
View File

@ -10,7 +10,7 @@ class Avocado:
# Set up our instance variables # Set up our instance variables
self.screen = screen self.screen = screen
self.screen_width, self.screen_height = screen.get_size() self.screen_width, self.screen_height = screen.get_size()
color = properties['color'] self.color = properties['color']
self.w, self.y = properties['size'] self.w, self.y = properties['size']
self.target = target self.target = target
self.boundaries = boundaries self.boundaries = boundaries
@ -18,7 +18,7 @@ class Avocado:
# Initialize the image # Initialize the image
self.i = pygame.image.load(filename).convert_alpha() 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.image = pygame.transform.scale(self.i, (self.w, self.y))
self.rect = self.image.get_rect() self.rect = self.image.get_rect()

10
game.py
View File

@ -36,6 +36,7 @@ class TheGame:
self.bg = pygame.image.load(os.path.join('img', 'lawyerCrystalBall.png')) self.bg = pygame.image.load(os.path.join('img', 'lawyerCrystalBall.png'))
self.bg.set_colorkey((255,255,255)) self.bg.set_colorkey((255,255,255))
self.bg.set_alpha(75) self.bg.set_alpha(75)
self.last_colors = []
# fonts # fonts
self.bigFont = pygame.font.Font(None, 90) self.bigFont = pygame.font.Font(None, 90)
@ -101,9 +102,16 @@ class TheGame:
def chooseRandomColor(self): def chooseRandomColor(self):
selected = random.randint(0, 3) 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] return self.colors[selected]
def gameOver(self): def gameOver(self):
screen_width, screen_height = self.screen.get_size() screen_width, screen_height = self.screen.get_size()
gameOverImage = pygame.image.load("img/gameOver.png") gameOverImage = pygame.image.load("img/gameOver.png")