From d15550a006da6d843646c1bfed042e735631c56c Mon Sep 17 00:00:00 2001 From: Alan Aguiar Date: Mon, 20 Jan 2014 17:08:26 +0000 Subject: add help state --- (limited to 'src') diff --git a/src/assets/images/back_game.png b/src/assets/images/back_game.png deleted file mode 100644 index de4edb0..0000000 --- a/src/assets/images/back_game.png +++ /dev/null Binary files differ diff --git a/src/assets/images/back_help.png b/src/assets/images/back_help.png index ed50b21..6c87ec6 100644 --- a/src/assets/images/back_help.png +++ b/src/assets/images/back_help.png Binary files differ diff --git a/src/game/CreditsState.py b/src/game/CreditsState.py index 758fa9d..ad1b8d2 100644 --- a/src/game/CreditsState.py +++ b/src/game/CreditsState.py @@ -46,7 +46,6 @@ class CCreditsState(CGameState): def update(self): - #print "menu update" CGameState.update(self) if self.mButtonBack.mouseOver(): @@ -63,7 +62,6 @@ class CCreditsState(CGameState): self.mButtonBack.setImage(self.mBackImageN) if self.mButtonBack.clicked(): - #print "clicked back......" ms = MenuState.CMenuState() CGame().setState(ms) diff --git a/src/game/HelpState.py b/src/game/HelpState.py new file mode 100644 index 0000000..143d580 --- /dev/null +++ b/src/game/HelpState.py @@ -0,0 +1,60 @@ +# -*- coding: utf-8 -*- + +import pygame +import MenuState +from api.GameState import CGameState +from api.Game import CGame +from api.Sprite2 import CSprite +from api.MultiLabel import CMultiLabel +import api.Image as Image + +from assets.data import credits_data + + +class CHelpState(CGameState): + + def init(self): + CGameState.init(self) + + self.mBackground = Image.loadImage('assets/images/back_help.png', False) + CGame().setBackground(self.mBackground) + + 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) + + + def update(self): + 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) + + def destroy(self): + CGameState.destroy(self) + CGame().removeChild(self.mButtonBack) + #CGame().removeChild(self.mCredits) + self.mButtonBack = None + self.mBackground = None diff --git a/src/game/MenuState.py b/src/game/MenuState.py index 127e2fe..a5e7c8e 100644 --- a/src/game/MenuState.py +++ b/src/game/MenuState.py @@ -5,6 +5,7 @@ from api.GameState import CGameState from api.Game import CGame from api.Button import CButton from CreditsState import CCreditsState +from HelpState import CHelpState import api.Image as Image from game.SelectPartidaState import CSelectPartidaState @@ -95,12 +96,10 @@ class CMenuState(CGameState): CGame().setState(partida) return - """elif self.mButtonHelp.clicked(): - print "clicked help" - #cs = CHelpState() - hp = CCreditsState() + elif self.mButtonHelp.clicked(): + hp = CHelpState() CGame().setState(hp) - return""" + return elif self.mButtonExit.clicked(): #print 'exit' -- cgit v0.9.1