From 5a49e3474f8d24f163e4535c0fe12fa6da14bf43 Mon Sep 17 00:00:00 2001 From: David Raison Date: Sat, 30 Aug 2014 23:34:52 +0200 Subject: [PATCH 1/2] ah, dunno --- avocado.py | 5 +++-- game.py | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/avocado.py b/avocado.py index ad9f36c..f4a4d5d 100644 --- a/avocado.py +++ b/avocado.py @@ -31,8 +31,9 @@ class Avocado: # Set the avocado's initial position and velocity self.init_pos() - self.vx = 10 - self.vy = 10 + self.vx = 2 + self.vy = 4 + self.is_falling = True self.has_been_pinned = False diff --git a/game.py b/game.py index bd548c4..9d0f227 100755 --- a/game.py +++ b/game.py @@ -69,6 +69,7 @@ class TheGame: self.click = pygame.mixer.Sound("audio/click.wav") return self.click + def gameOver(self,screen,gameOverImage): screen.blit(pygame.transform.scale(gameOverImage, (800, 600)), (0, 0)) pygame.display.flip() @@ -79,7 +80,7 @@ class TheGame: clock = pygame.time.Clock() size = (800, 600) bg = pygame.image.load("img/background.png") - desired_fps = 15 + desired_fps = 60 multiplier = 3 score = 0 time = timeleft = 30 From 9bcf82045ab1b91f83c856eb3aa73b18ebe5a734 Mon Sep 17 00:00:00 2001 From: David Raison Date: Sat, 30 Aug 2014 23:45:04 +0200 Subject: [PATCH 2/2] Moar randomness --- avocado.py | 2 +- game.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/avocado.py b/avocado.py index cedd8fc..2cfa4d5 100644 --- a/avocado.py +++ b/avocado.py @@ -11,7 +11,7 @@ class Avocado: # 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 :( - if random.randint(0,1) == 0: + if random.randint(0,40) != 1: self.is_falling = False self.has_been_pinned = False return None diff --git a/game.py b/game.py index b4f7f28..cdd0c2d 100755 --- a/game.py +++ b/game.py @@ -95,7 +95,6 @@ class TheGame: # I don't know, should we move this text out of the way? game_over = font.render('GAME OVER', 0, RED) - gameOverImage = pygame.image.load("img/gameOver.png") # initialize the game canvas @@ -177,7 +176,6 @@ class TheGame: for a in self.pinned: a.blitme() - # Catch events for event in pygame.event.get(): # Collision detection