fixed a missing self

master
David Raison 2014-08-31 00:15:36 +02:00
parent 6857d5cca3
commit 025f2e7e66
1 changed files with 16 additions and 11 deletions

27
game.py
View File

@ -14,23 +14,27 @@ from interface import hud
class TheGame: class TheGame:
def __init__(self): def __init__(self):
""" foo """ """ Initialize the game """
pygame.init()
pygame.display.set_caption('Pin Avo, the Cado!')
# initialize the game canvas # initialize the game canvas
self.size = (800, 600) self.size = (800, 600)
self.screen = pygame.display.set_mode(self.size) self.screen = pygame.display.set_mode(self.size)
self.colors = [BLUE, GREEN, RED, YELLOW] self.colors = [BLUE, GREEN, RED, YELLOW]
pygame.init()
# fonts
self.big = pygame.font.Font(None, 90) self.big = pygame.font.Font(None, 90)
self.pinned = [] self.pinned = []
try: try:
pygame.mixer.init() pygame.mixer.init()
pygame.mixer.music.set_volume(0.5) pygame.mixer.music.set_volume(0.5)
noSound = False sound = True
except: except:
print("Y U NO sound? :(") print("Y U NO sound? :(")
noSound = True sound = False
pygame.display.set_caption('Pin Avo, the Cado!')
def mute(self,mute=False, sound=True): def mute(self,mute=False, sound=True):
@ -77,6 +81,7 @@ class TheGame:
self.fade() self.fade()
pygame.time.wait(3000) pygame.time.wait(3000)
pygame.quit() pygame.quit()
sys.exit()
def keepPinned(self, avocado): def keepPinned(self, avocado):
@ -93,20 +98,20 @@ class TheGame:
level = 1 level = 1
levelChange = 0 levelChange = 0
reachScore = 200 reachScore = 200
avoClick = game.loadClick() avoClick = self.loadClick()
# initialize the HUD class and the lawyer # initialize the HUD class and the lawyer
the_hud = hud.Hud(self.screen) the_hud = hud.Hud(self.screen)
fullegast = lawyer.Lawyer(self.screen) fullegast = lawyer.Lawyer(self.screen)
# Initial color # Initial color indication
color = self.chooseRandomColor() color = self.chooseRandomColor()
fullegast.setColor(color) fullegast.setColor(color)
avocados = [] avocados = [] # We could use this for redrawing only this part
running = True running = True
while running:
while running:
time_passed = clock.tick(desired_fps) time_passed = clock.tick(desired_fps)
fps = clock.get_fps() fps = clock.get_fps()
screen_width, screen_height = self.size screen_width, screen_height = self.size
@ -132,7 +137,7 @@ class TheGame:
if levelChange > 0: if levelChange > 0:
levelText = self.big.render('Level ' + str(level), 0, WHITE) levelText = self.big.render('Level ' + str(level), 0, WHITE)
screen.blit(levelText, (screen_width / 3, screen_height / 2)) self.screen.blit(levelText, (screen_width / 3, screen_height / 2))
levelChange -= 1 levelChange -= 1
timeleft -= time_passed / 1000 timeleft -= time_passed / 1000