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 10:29:08 +02:00
parent 13786f52cb f45632acee
commit c6e35bf61e
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
avocado.py
View File

@ -62,10 +62,10 @@ class Avocado:
self.has_been_pinned = True self.has_been_pinned = True
self.is_still_falling = False self.is_still_falling = False
self.click.play() self.click.play()
return True return True, self.rect.center
else: else:
self.clickFail.play() self.clickFail.play()
return False return False, (0, 0)
# BUG - isHit is called 4 times upon click which makes it return the # BUG - isHit is called 4 times upon click which makes it return the
# first time but fail the consecutive times # first time but fail the consecutive times
#else: #else:

6
game.py
View File

@ -106,7 +106,8 @@ class TheGame:
gameOverImage = pygame.image.load("img/gameOver.png") gameOverImage = pygame.image.load("img/gameOver.png")
gameOverText = self.bigFont.render('GAME OVER', 0, YELLOW) gameOverText = self.bigFont.render('GAME OVER', 0, YELLOW)
gameOverImage.blit(gameOverText, (screen_width/8, screen_height/7)) gameOverImage.blit(gameOverText, (screen_width/8, screen_height/7))
self.screen.blit(pygame.transform.scale(gameOverImage, self.size), (0, 0)) self.screen.blit(pygame.transform.scale(gameOverImage,
self.screen.get_size()), (0, 0))
pygame.display.flip() pygame.display.flip()
self.fadeSound() self.fadeSound()
pygame.time.wait(3000) pygame.time.wait(3000)
@ -257,9 +258,10 @@ class TheGame:
# Check if any avocados have been hit # Check if any avocados have been hit
for avo in self.movingAvocados: for avo in self.movingAvocados:
hit = avo.isHit(mousepos) hit, center = avo.isHit(mousepos)
if hit: if hit:
score += 100 score += 100
newPin.throwAt(center)
color = self.chooseRandomColor() color = self.chooseRandomColor()
crystalBall.setColor(color) crystalBall.setColor(color)
elif hit == False: elif hit == False:

6
pingenerator.py
View File

@ -13,11 +13,12 @@ class Generate:
screen_width, screen_height = screen.get_size() screen_width, screen_height = screen.get_size()
self.pos = (screen_width / 2, screen_height) self.pos = (screen_width / 2, screen_height)
self.image = pygame.image.load(os.path.join('img','pin.png')).convert_alpha() self.image = pygame.image.load(os.path.join('img','pin.png')).convert_alpha()
self.size = self.image.get_size()
def throwAt(self, target): def throwAt(self, target):
self.inFlight = True self.inFlight = True
self.target = target x, y = target
self.target = (x, y - self.size[1])
def isStuck(self): def isStuck(self):
@ -29,7 +30,6 @@ class Generate:
def blitme(self): def blitme(self):
self.screen.blit(self.image, self.pos) self.screen.blit(self.image, self.pos)
def moveTowardsTarget(self): def moveTowardsTarget(self):
############################## ##############################
# #