diff options
author | Alan Aguiar <alanjas@hotmail.com> | 2013-09-24 11:53:51 (GMT) |
---|---|---|
committer | Alan Aguiar <alanjas@hotmail.com> | 2013-09-24 11:53:51 (GMT) |
commit | a773f9c609405fc9eb027c0e2618aee3082b5bce (patch) | |
tree | 11f5b5d42f1875398a13287491bacafceb37bcf0 | |
parent | 31b2007d17ca9daec4d50dde3d4a024b679363be (diff) |
some changes in backs
-rw-r--r-- | src/game/Area1Game1.py | 5 | ||||
-rw-r--r-- | src/game/HallState.py | 1 | ||||
-rw-r--r-- | src/game/MenuState.py | 55 | ||||
-rw-r--r-- | src/game/PresentationState.py | 22 | ||||
-rw-r--r-- | src/game/SelectAreaState.py | 47 | ||||
-rw-r--r-- | src/game/SelectPartidaState.py | 34 |
6 files changed, 115 insertions, 49 deletions
diff --git a/src/game/Area1Game1.py b/src/game/Area1Game1.py index 9a6e261..868fd58 100644 --- a/src/game/Area1Game1.py +++ b/src/game/Area1Game1.py @@ -174,7 +174,8 @@ class CArea1Game1(CGameState): self.mBackImageB = Image.loadImage('assets/images/back_big.png') self.mButtonBackA1G1 = CSprite() - self.mButtonBackA1G1.setXY(1140, 5) + self.mButtonBackA1G1.setRegistrationPointOffset(22, 22) + self.mButtonBackA1G1.setXY(1170, 30) self.mButtonBackA1G1.setImage(self.mBackImageN) CGame().addChild(self.mButtonBackA1G1) @@ -269,11 +270,13 @@ class CArea1Game1(CGameState): if not(self.mBsetted): self.mBsetted = True self.mNsetted = False + self.mButtonBackA1G1.setRegistrationPointOffset(27, 27) self.mButtonBackA1G1.setImage(self.mBackImageB) else: if not(self.mNsetted): self.mBsetted = False self.mNSetted = True + self.mButtonBackA1G1.setRegistrationPointOffset(22, 22) self.mButtonBackA1G1.setImage(self.mBackImageN) if self.mButtonBackA1G1.clicked(): diff --git a/src/game/HallState.py b/src/game/HallState.py index b8e9eae..bb5294d 100644 --- a/src/game/HallState.py +++ b/src/game/HallState.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- import pygame -import MenuState import SelectAreaState # import CSelectAreaState from api.GameState import CGameState diff --git a/src/game/MenuState.py b/src/game/MenuState.py index f8d8aba..a581f07 100644 --- a/src/game/MenuState.py +++ b/src/game/MenuState.py @@ -37,55 +37,52 @@ class CMenuState(CGameState): def init(self): CGameState.__init__(self) + self.mBackground = Image.loadImage('assets/images/selectArea/background.jpg', False) + CGame().setBackground(self.mBackground) + self.mButtonPresentation = CButton() self.mButtonPresentation.bgColor = (0x99, 0x99, 0x66) self.mButtonPresentation.fgColor = (0xFF, 0xFF, 0xFF) self.mButtonPresentation.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28) self.mButtonPresentation.set_center((200, 100)) self.mButtonPresentation.set_size((200, 40)) - self.mButtonPresentation.set_text(_('Presentacion')) + self.mButtonPresentation.set_text(unicode(_('Presentacion'), 'UTF-8')) CGame().addChild(self.mButtonPresentation) - self.mButtonPartida = CButton() - self.mButtonPartida.bgColor = (0x99, 0x99, 0x66) - self.mButtonPartida.fgColor = (0xFF, 0xFF, 0xFF) - self.mButtonPartida.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28) - self.mButtonPartida.set_center((200, 250)) - self.mButtonPartida.set_size((200, 40)) - self.mButtonPartida.set_text(_('Partida')) - CGame().addChild(self.mButtonPartida) + self.mButtonPlay = CButton() + self.mButtonPlay.bgColor = (0x99, 0x99, 0x66) + self.mButtonPlay.fgColor = (0xFF, 0xFF, 0xFF) + self.mButtonPlay.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 32) + self.mButtonPlay.set_center((600, 370)) + self.mButtonPlay.set_size((200, 40)) + self.mButtonPlay.set_text(unicode(_('Jugar'), 'UTF-8')) + CGame().addChild(self.mButtonPlay) self.mButtonCredits = CButton() self.mButtonCredits.bgColor = (0x99, 0x99, 0x66) - self.mButtonCredits.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 20) + self.mButtonCredits.fgColor = (0xFF, 0xFF, 0xFF) + self.mButtonCredits.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 32) self.mButtonCredits.set_center((600, 420)) self.mButtonCredits.set_size((200, 40)) - self.mButtonCredits.set_text(_('Créditos')) + self.mButtonCredits.set_text(unicode(_('Créditos'), 'UTF-8')) CGame().addChild(self.mButtonCredits) - """self.mButtonPlay = CButton() - self.mButtonPlay.bgColor = (0x99, 0x99, 0x66) - self.mButtonPlay.fgColor = (0xFF, 0xFF, 0xFF) - self.mButtonPlay.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28) - self.mButtonPlay.set_center((600, 50)) - self.mButtonPlay.set_size((200, 40)) - self.mButtonPlay.set_text('Jugar') - CGame().addChild(self.mButtonPlay)""" - self.mButtonHelp = CButton() self.mButtonHelp.bgColor = (0x99, 0x99, 0x66) + self.mButtonHelp.fgColor = (0xFF, 0xFF, 0xFF) self.mButtonHelp.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 32) self.mButtonHelp.set_center((600, 470)) self.mButtonHelp.set_size((200, 40)) - self.mButtonHelp.set_text(_('Ayuda')) + self.mButtonHelp.set_text(unicode(_('Ayuda'), 'UTF-8')) CGame().addChild(self.mButtonHelp) self.mButtonExit = CButton() self.mButtonExit.bgColor = (0x99, 0x99, 0x66) + self.mButtonExit.fgColor = (0xFF, 0xFF, 0xFF) self.mButtonExit.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 32) self.mButtonExit.set_center((600, 520)) self.mButtonExit.set_size((200, 40)) - self.mButtonExit.set_text(_('Salir')) + self.mButtonExit.set_text(unicode(_('Salir'), 'UTF-8')) CGame().addChild(self.mButtonExit) self.mButtonA1G1 = CButton() @@ -136,8 +133,7 @@ class CMenuState(CGameState): self.mButtonA2G2.set_text('A2 - Juego 2') CGame().addChild(self.mButtonA2G2) - self.mBackground = Image.loadImage('assets/images/back_menu.png', False) - CGame().setBackground(self.mBackground) + def update(self): #print "menu update" @@ -162,8 +158,8 @@ class CMenuState(CGameState): CGame().setState(presentation) return - elif self.mButtonPartida.clicked(): - print "clicked partida" + elif self.mButtonPlay.clicked(): + print "clicked play" partida = CSelectPartidaState() CGame().setState(partida) return @@ -227,9 +223,8 @@ class CMenuState(CGameState): #self.mInstructions.destroy() self.mInstructions = None CGame().removeChild(self.mButtonCredits) - #CGame().removeChild(self.mButtonPlay) CGame().removeChild(self.mButtonPresentation) - CGame().removeChild(self.mButtonPartida) + CGame().removeChild(self.mButtonPlay) CGame().removeChild(self.mButtonHelp) CGame().removeChild(self.mButtonExit) CGame().removeChild(self.mButtonA1G1) @@ -238,9 +233,9 @@ class CMenuState(CGameState): CGame().removeChild(self.mButtonA1G5) CGame().removeChild(self.mButtonA1G6) CGame().removeChild(self.mButtonA2G2) - #self.mButtonPlay.destroy() + self.mButtonCredits = None - #self.mButtonPlay = None + self.mButtonPlay = None self.mButtonExit = None self.mButtonExit = None self.mButtonA1G1 = None diff --git a/src/game/PresentationState.py b/src/game/PresentationState.py index f12f06d..5fb0077 100644 --- a/src/game/PresentationState.py +++ b/src/game/PresentationState.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- +import MenuState from api.GameState import CGameState from api.Game import CGame -from game.SelectPartidaState import CSelectPartidaState from api.Sprite2 import CSprite import api.Image as Image - +from api.Mouse import CMouse class CPresentationState(CGameState): @@ -14,6 +14,7 @@ class CPresentationState(CGameState): def init(self): CGameState.__init__(self) + self.mactive = False self.mBackground = Image.loadImage('assets/images/selectArea/background.jpg', False) CGame().setBackground(self.mBackground) @@ -44,11 +45,22 @@ class CPresentationState(CGameState): self.mCount = self.mCount + 1 if self.mCount > 150: - print "clicked credits" - partida = CSelectPartidaState() - CGame().setState(partida) + print "time ends" + ms = MenuState.CMenuState() + CGame().setState(ms) return + if CMouse().firstPress(): + self.mactive = True + + if self.mactive == True: + if CMouse().release(): + self.mactive = False + print "click" + ms = MenuState.CMenuState() + CGame().setState(ms) + return + def destroy(self): CGameState.destroy(self) CGame().removeChild(self.mElisa) diff --git a/src/game/SelectAreaState.py b/src/game/SelectAreaState.py index 261ccb1..657cd20 100644 --- a/src/game/SelectAreaState.py +++ b/src/game/SelectAreaState.py @@ -6,7 +6,6 @@ import MenuState from api.GameState import CGameState from api.MultiLabel import CMultiLabel from api.Game import CGame -from api.Button import CButton from api.Sprite2 import CSprite import api.Image as Image from api.Mouse import CMouse @@ -15,7 +14,6 @@ from HallState import CHallState from assets.data import selectArea_data -from gettext import gettext as _ class CSelectAreaState(CGameState): @@ -43,18 +41,22 @@ class CSelectAreaState(CGameState): def init(self): CGameState.init(self) + self.mBackground = Image.loadImage('assets/images/selectArea/background.jpg', False) + CGame().setBackground(self.mBackground) + self.mPartida = None - self.mButtonBack = CButton() - self.mButtonBack.set_bgColor((0x99, 0x99, 0x66)) - self.mButtonBack.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 20) - self.mButtonBack.set_center((100, 100)) - self.mButtonBack.set_size((200, 40)) - self.mButtonBack.set_text(_("Volver")) - CGame().addChild(self.mButtonBack) + self.mBsetted = False + self.mNsetted = True + + self.mBackImageN = Image.loadImage('assets/images/back.png') + self.mBackImageB = Image.loadImage('assets/images/back_big.png') - self.mBackground = Image.loadImage('assets/images/selectArea/background.jpg', False) - CGame().setBackground(self.mBackground) + self.mButtonBack = CSprite() + self.mButtonBack.setRegistrationPointOffset(22, 22) + self.mButtonBack.setXY(1170, 30) + self.mButtonBack.setImage(self.mBackImageN) + CGame().addChild(self.mButtonBack) self.mAreas_list = [] for a in selectArea_data.AREAS: @@ -116,6 +118,24 @@ class CSelectAreaState(CGameState): CGame().setState(ms) return + if self.mButtonBack.mouseOver(): + if not(self.mBsetted): + self.mBsetted = True + self.mNsetted = False + self.mButtonBack.setRegistrationPointOffset(27, 27) + self.mButtonBack.setImage(self.mBackImageB) + else: + if not(self.mNsetted): + self.mBsetted = False + self.mNSetted = True + self.mButtonBack.setRegistrationPointOffset(22, 22) + self.mButtonBack.setImage(self.mBackImageN) + + if self.mButtonBack.clicked(): + ms = MenuState.CMenuState() + CGame().setState(ms) + return + x = CMouse().getX() y = CMouse().getY() @@ -169,7 +189,10 @@ class CSelectAreaState(CGameState): self.mPartida = aPartida def destroy(self): - print 'A1G1 destroy' + print 'select area state destroy' + CGame().removeChild(self.mButtonBack ) + self.mButtonBack = None + CGameState.destroy(self) CGame().removeChild(self.mButtonBack) self.mButtonBack = None diff --git a/src/game/SelectPartidaState.py b/src/game/SelectPartidaState.py index 7bec1df..43e0110 100644 --- a/src/game/SelectPartidaState.py +++ b/src/game/SelectPartidaState.py @@ -11,6 +11,7 @@ from api.PartidasMan import Partida from SelectCharacterState import CSelectCharacterState from SelectAreaState import CSelectAreaState +import MenuState import api.Image as Image @@ -35,6 +36,18 @@ class CSelectPartidaState(CGameState): self.mP2_Stars = [] self.mP3_Stars = [] + self.mBsetted = False + self.mNsetted = True + + self.mBackImageN = Image.loadImage('assets/images/back.png') + self.mBackImageB = Image.loadImage('assets/images/back_big.png') + + self.mButtonBack = CSprite() + self.mButtonBack.setRegistrationPointOffset(22, 22) + self.mButtonBack.setXY(1170, 30) + self.mButtonBack.setImage(self.mBackImageN) + CGame().addChild(self.mButtonBack) + delete = Image.loadImage('assets/images/selectPartida/delete.png') self.mDeletePartida1 = CSprite() @@ -343,6 +356,24 @@ class CSelectPartidaState(CGameState): #print "menu update" CGameState.update(self) + if self.mButtonBack.mouseOver(): + if not(self.mBsetted): + self.mBsetted = True + self.mNsetted = False + self.mButtonBack.setRegistrationPointOffset(27, 27) + self.mButtonBack.setImage(self.mBackImageB) + else: + if not(self.mNsetted): + self.mBsetted = False + self.mNSetted = True + self.mButtonBack.setRegistrationPointOffset(22, 22) + self.mButtonBack.setImage(self.mBackImageN) + + if self.mButtonBack.clicked(): + ms = MenuState.CMenuState() + CGame().setState(ms) + return + if self.mDeletePartida1.clicked(): self.mToDel = 1 self.addDialog() @@ -468,6 +499,9 @@ class CSelectPartidaState(CGameState): def destroy(self): CGameState.destroy(self) + + CGame().removeChild(self.mButtonBack ) + self.mButtonBack = None CGame().removeChild(self.mMessage) self.mMessage = None |