diff options
author | Alan Aguiar <alanjas@hotmail.com> | 2012-04-30 15:20:51 (GMT) |
---|---|---|
committer | Alan Aguiar <alanjas@hotmail.com> | 2012-04-30 15:20:51 (GMT) |
commit | e192ec68efeb9b5fa9bc814fd71663b1eb37025f (patch) | |
tree | da193961d0d1f3086dd888426a5667b31f394201 /src/game/MenuState.py | |
parent | 25e51fe9d3c6858a355a45657be4c7787e222594 (diff) |
remove documents and update a1g6
Diffstat (limited to 'src/game/MenuState.py')
-rw-r--r-- | src/game/MenuState.py | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/src/game/MenuState.py b/src/game/MenuState.py index 3d99589..3d7482b 100644 --- a/src/game/MenuState.py +++ b/src/game/MenuState.py @@ -24,8 +24,8 @@ from game.Area1Game1 import CArea1Game1 import game.Area1Game3 from game.Area1Game3 import CArea1Game3 -import game.Area1Game5 -from game.Area1Game5 import CArea1Game5 +import game.Area1Game6 +from game.Area1Game6 import CArea1Game6 from gettext import gettext as _ @@ -37,6 +37,7 @@ class CMenuState(CGameState): mButtonA1G1= None mButtonA1G3 = None + mButtonA1G6 = None mButtonCredits = None mButtonPlay = None @@ -104,13 +105,13 @@ class CMenuState(CGameState): self.mButtonA1G3.set_text('A1 - Juego 3') CGame().addChild(self.mButtonA1G3) - self.mButtonA1G5 = CButton() - self.mButtonA1G5.bgColor = (0x99, 0x99, 0x66) - self.mButtonA1G5.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 20) - self.mButtonA1G5.set_center((110, 520)) - self.mButtonA1G5.set_size((200, 40)) - self.mButtonA1G5.set_text('A1 - Juego 5') - CGame().addChild(self.mButtonA1G5) + self.mButtonA1G6 = CButton() + self.mButtonA1G6.bgColor = (0x99, 0x99, 0x66) + self.mButtonA1G6.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 20) + self.mButtonA1G6.set_center((110, 520)) + self.mButtonA1G6.set_size((200, 40)) + self.mButtonA1G6.set_text('A1 - Juego 6') + CGame().addChild(self.mButtonA1G6) self.mBackground = Image.loadImage('assets/images/back_menu.png', False) CGame().setBackground(self.mBackground) @@ -124,11 +125,13 @@ class CMenuState(CGameState): #cs = CHelpState() credits = CCreditsState() CGame().setState(credits) + return elif self.mButtonPlay.clicked(): print "clicked play" selectArea = CSelectAreaState() CGame().setState(selectArea) + return # game = CLevelState() # CGame().setState(game) @@ -137,6 +140,7 @@ class CMenuState(CGameState): #cs = CHelpState() help = CCreditsState() CGame().setState(help) + return elif self.mButtonExit.clicked(): print 'exit' @@ -148,18 +152,21 @@ class CMenuState(CGameState): #cs = CHelpState() a1g1 = CArea1Game1() CGame().setState(a1g1) + return elif self.mButtonA1G3.clicked(): print "clicked A1G3" #cs = CHelpState() a1g3 = CArea1Game3() CGame().setState(a1g3) + return - elif self.mButtonA1G7.clicked(): + elif self.mButtonA1G6.clicked(): print "clicked A1G3" #cs = CHelpState() - a1g5 = CArea1Game7() - CGame().setState(a1g5) + a1g6 = CArea1Game6() + CGame().setState(a1g6) + return #def render(self): # CGameState.render(self) @@ -175,7 +182,7 @@ class CMenuState(CGameState): CGame().removeChild(self.mButtonExit) CGame().removeChild(self.mButtonA1G1) CGame().removeChild(self.mButtonA1G3) - CGame().removeChild(self.mButtonA1G5) + CGame().removeChild(self.mButtonA1G6) #self.mButtonPlay.destroy() self.mButtonCredits = None self.mButtonPlay = None @@ -183,7 +190,7 @@ class CMenuState(CGameState): self.mButtonExit = None self.mButtonA1G1 = None self.mButtonA1G3 = None - self.mButtonA1G7 = None + self.mButtonA1G6 = None self.mBackground = None print "CMenuState destroy" |