diff options
author | Alan Aguiar <alanjas@hotmail.com> | 2014-01-20 17:08:26 (GMT) |
---|---|---|
committer | Alan Aguiar <alanjas@hotmail.com> | 2014-01-20 17:08:26 (GMT) |
commit | d15550a006da6d843646c1bfed042e735631c56c (patch) | |
tree | bf29cb9a959aa90fa53a1ec66febcb56848ff4eb | |
parent | 72eeba6b01b3328f8362bf7db6c34fbb774748a8 (diff) |
add help state
-rw-r--r-- | .project | 2 | ||||
-rw-r--r-- | .settings/org.eclipse.core.resources.prefs | 1 | ||||
-rw-r--r-- | EdSexual.activity/activity.py | 5 | ||||
-rw-r--r-- | src/assets/images/back_game.png | bin | 24326 -> 0 bytes | |||
-rw-r--r-- | src/assets/images/back_help.png | bin | 34706 -> 5164 bytes | |||
-rw-r--r-- | src/game/CreditsState.py | 2 | ||||
-rw-r--r-- | src/game/HelpState.py | 60 | ||||
-rw-r--r-- | src/game/MenuState.py | 9 |
8 files changed, 66 insertions, 13 deletions
@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>CeibalJamEducacionSexual</name> + <name>EducacionSexual</name> <comment></comment> <projects> </projects> diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index a19837a..7650586 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -11,6 +11,7 @@ encoding//src/api/Label.py=utf-8 encoding//src/api/Math.py=utf-8 encoding//src/api/Mouse.py=utf-8 encoding//src/api/MultiLabel.py=utf-8 +encoding//src/api/Sprite.py=utf-8 encoding//src/api/Sprite2.py=utf-8 encoding//src/api/Vector.py=utf-8 encoding//src/assets/data/area1game3_data.py=utf-8 diff --git a/EdSexual.activity/activity.py b/EdSexual.activity/activity.py index f5878cb..f2c1ac9 100644 --- a/EdSexual.activity/activity.py +++ b/EdSexual.activity/activity.py @@ -19,9 +19,4 @@ class Activity(activity.Activity): self._pygamecanvas.grab_focus() self._pygamecanvas.run_pygame(self.actividad.main) - def read_file(self, file_path): - pass - - def write_file(self, file_path): - pass diff --git a/src/assets/images/back_game.png b/src/assets/images/back_game.png Binary files differdeleted file mode 100644 index de4edb0..0000000 --- a/src/assets/images/back_game.png +++ /dev/null diff --git a/src/assets/images/back_help.png b/src/assets/images/back_help.png Binary files differindex ed50b21..6c87ec6 100644 --- a/src/assets/images/back_help.png +++ b/src/assets/images/back_help.png 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' |