diff options
| -rw-r--r-- | src/game/Area1Game3.py | 15 | ||||
| -rw-r--r-- | src/game/Area1Game4.py | 8 | ||||
| -rw-r--r-- | src/game/Area1Game6.py | 28 | ||||
| -rw-r--r-- | src/game/Area2Game2.py | 5 | ||||
| -rw-r--r-- | src/game/SelectAreaState.py | 5 |
5 files changed, 11 insertions, 50 deletions
diff --git a/src/game/Area1Game3.py b/src/game/Area1Game3.py index ebf1d02..0d394a5 100644 --- a/src/game/Area1Game3.py +++ b/src/game/Area1Game3.py @@ -13,10 +13,7 @@ from api.MultiLabel import CMultiLabel from api.Points import CPoints from gettext import gettext as _ -import sys -sys.path.insert(0, 'assets/data') - -import area1game3_data +from assets.data import area1game3_data class CArea1Game3(CGameState): @@ -50,8 +47,6 @@ class CArea1Game3(CGameState): self.mBad = 0 self.mGood = 0 - - self.mBackground = Image.loadImage('assets/images/a1g3/a1game3.png', False) CGame().setBackground(self.mBackground) @@ -68,7 +63,6 @@ class CArea1Game3(CGameState): random.shuffle(self.mboy_list) random.shuffle(self.mgirl_list) - self.mButtonBackA1G3 = CButton() self.mButtonBackA1G3.set_bgColor((0x99, 0x99, 0x66)) self.mButtonBackA1G3.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 20) @@ -77,14 +71,12 @@ class CArea1Game3(CGameState): self.mButtonBackA1G3.set_text(_('Volver')) CGame().addChild(self.mButtonBackA1G3) - self.mLabelQuestion = CMultiLabel() #self.mLabelQuestion.set_bgColor((0x99, 0x50, 0x99)) #self.mLabelQuestion.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 13) self.mLabelQuestion.set_center((600, 150)) self.mLabelQuestion.set_size((600, 150)) - self.mButtonTrue = CButton() self.mButtonTrue.set_bgColor((0x99, 0x99, 0x66)) self.mButtonTrue.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 20) @@ -109,8 +101,6 @@ class CArea1Game3(CGameState): self.mGirl.setXY(900, 300) CGame().addChild(self.mGirl) - - # sabes que le pasa self.mDialogBoy1 = CMultiLabel() self.mDialogBoy1.set_center((300, 200)) @@ -160,8 +150,7 @@ class CArea1Game3(CGameState): ms = MenuState.CMenuState() CGame().setState(ms) return - - + if self.mCurrentState == 0: #self.time = self.mListDialogs[0].getTimeState() if self.time > 4*30: diff --git a/src/game/Area1Game4.py b/src/game/Area1Game4.py index c1774cd..1e37e09 100644 --- a/src/game/Area1Game4.py +++ b/src/game/Area1Game4.py @@ -13,13 +13,11 @@ from api.MultiLabel import CMultiLabel from api.Points import CPoints from gettext import gettext as _ -import sys -sys.path.insert(0, 'assets/data') - -import area1game4_data +from assets.data import area1game4_data STATE_ANSWER = 1 STATE_ANIM = 2 +TIME_ANIM = 60 class CArea1Game4(CGameState): @@ -137,7 +135,7 @@ class CArea1Game4(CGameState): print 'fin preguntas' else: self.mAnimCounter = self.mAnimCounter + 1 - if self.mAnimCounter > 60: + if self.mAnimCounter > TIME_ANIM: self.mAnimCounter = 0 CGame().removeChild(self.mGoodSprite) CGame().removeChild(self.mBadSprite) diff --git a/src/game/Area1Game6.py b/src/game/Area1Game6.py index 7d4a08c..4a211b6 100644 --- a/src/game/Area1Game6.py +++ b/src/game/Area1Game6.py @@ -17,6 +17,8 @@ import MenuState from gettext import gettext as _ +from assets.data import area1game6_data + STATE_STALE = 0 STATE_DRAG = 1 STATE_ADJUST = 2 @@ -26,12 +28,6 @@ STATE_OK = 4 DX = 50 DY = 50 - -#sys.path.insert(0, 'assets/data') -#import area1game7_data - -import imp - WORD1 = [(DX + 400, DY + 0), (DX + 800, DY + 0), (DX + 400, DY + 50), (DX + 800, DY + 50)] WORD2a = [(DX + 150, DY + 100), (DX + 350, DY + 100), (DX + 150, DY + 150), (DX + 350, DY + 150)] WORD2b = [(DX + 400, DY + 100), (DX + 600, DY + 100), (DX + 400, DY + 150), (DX + 600, DY + 150)] @@ -285,8 +281,7 @@ class CArea1Game6(CGameState): CGame().addChild(piece) - - self.loadInfo() + self.dic_help = area1game6_data.HELP self.list_temp = self.dic_help.keys() self.mListHelps = [] @@ -375,19 +370,4 @@ class CArea1Game6(CGameState): self.mPoints = None print "CArea1Game6 destroy" - - def loadInfo(self): - r_path = os.path.join('assets/data', 'area1game6_data.py') - a_path = os.path.abspath(r_path) - f = None - try: - f = imp.load_source('area1game6_data', a_path) - except: - print _('Cannot open %s') % 'area1game6_data' - - if f: - #if hasattr(f, 'EXPLORATIONS'): - self.dic_help = f.HELP - - def doEvents(self, aEvent): - print aEvent.type
\ No newline at end of file +
\ No newline at end of file diff --git a/src/game/Area2Game2.py b/src/game/Area2Game2.py index fe52c2c..d5d2577 100644 --- a/src/game/Area2Game2.py +++ b/src/game/Area2Game2.py @@ -13,10 +13,7 @@ from api.MultiLabel import CMultiLabel from api.Points import CPoints from gettext import gettext as _ -import sys -sys.path.insert(0, 'assets/data') - -import area2game2_data +from assets.data import area2game2_data class CArea2Game2(CGameState): diff --git a/src/game/SelectAreaState.py b/src/game/SelectAreaState.py index ed9c1d8..5bf3020 100644 --- a/src/game/SelectAreaState.py +++ b/src/game/SelectAreaState.py @@ -24,10 +24,7 @@ import api.Math as CMath import HallState from HallState import * -import sys -sys.path.insert(0, 'assets/data') - -import selectArea_data +from assets.data import selectArea_data import pygame |