allow entry to each game from hall

1 files changed, 43 insertions, 30 deletions

diff --git a/src/game/HallState.py b/src/game/HallState.py
index 359940f..28e02a8 100644
--- a/src/game/HallState.py
+++ b/src/game/HallState.py
@@ -12,7 +12,10 @@ from api.Mouse import CMouse
 import api.Math as CMath
 from BoyHall import CBoyHall
 from Area1Game1 import CArea1Game1
-
+from Area1Game3 import CArea1Game3
+from Area1Game4 import CArea1Game4
+from Area1Game5 import CArea1Game5
+from Area1Game6 import CArea1Game6
 
 class CHallState(CGameState):
  
@@ -25,16 +28,13 @@ class CHallState(CGameState):
         #mX = 10
         self.mButtonBack = None
         self.mBsetted = False
-        self.mNsetted = True        
-        self.mCurrentSelectedArea = 0
+        self.mNsetted = True
         self.mPlayer = None    
         self.mtext = None
         self.mGo = None
     
         self.AREA1_POLYGON = [(424,90), (764,90), (764, 700), (424,700)]
 
-        
-        self.mPartida = None
         self.mAreaStates = []
         
         self.mCurrentSelectedArea = 0
@@ -55,8 +55,6 @@ class CHallState(CGameState):
         self.mBackgroundList.append(CImage.loadImage('assets/images/hall/A1-Pasillo-5.jpg', False))
         self.mBackgroundList.append(CImage.loadImage('assets/images/hall/A1-Pasillo-6.jpg', False))
         
-        CGame().setBackground(self.mBackgroundList[self.mCurrentSelectedArea])
-                
         self.mDoor = CSprite()
         self.mDoor.setXY(400, 50)
         self.mFrameImageDoor = Image.loadImage('assets/images/hall/A1-puerta-resaltada.png')
@@ -77,8 +75,30 @@ class CHallState(CGameState):
         self.mRightArrow.setImage(self.mImageRightArrow)
         CGame().addChild(self.mRightArrow)
 
+        number = CGame().getCurrentPartida()
+        #TODO: remove from here?
+        par = CGame().getPartida(number)
+        character = par.getCharacter()
+        
+        self.mPlayer = CBoyHall(character)
+        CGame().addChild(self.mPlayer, 1)
+        #TODO no solo area 1
+        a1 = par.getArea(1)
+        for i in range(6):
+            s = CSprite()
+            if a1[i] == 0:
+                s.setImage(self.mStar1)
+            else:
+                s.setImage(self.mStar2)
+            s.setXY(730, 40)
+            self.mAreaStates.append(s)
         
         
+    def setCurrentGame(self, n):
+        self.mCurrentSelectedArea = n
+        CGame().setBackground(self.mBackgroundList[self.mCurrentSelectedArea])
+        CGame().addChild(self.mAreaStates[self.mCurrentSelectedArea])
+        
     def update(self):
         #print "menu update"
         CGameState.update(self)
@@ -101,7 +121,6 @@ class CHallState(CGameState):
             #ms = MenuState.CMenuState()
             cs = SelectAreaState.CSelectAreaState()
             CGame().setState(cs)
-            cs.setPartida(self.mPartida)
             return
         
         elif self.mLeftArrow.clicked():
@@ -166,29 +185,23 @@ class CHallState(CGameState):
             x = self.mPlayer.getX()
             if (x > 400) and (x < 600):
                 if self.mGo == 0:
-                    a1g1 = CArea1Game1()
-                    CGame().setState(a1g1)
-                
+                    area = CArea1Game1()
+                    CGame().setState(area)
+                elif self.mGo == 1:
+                    self.mGo = None
+                elif self.mGo == 2:
+                    area = CArea1Game3()
+                    CGame().setState(area)
+                elif self.mGo == 3:
+                    area = CArea1Game4()
+                    CGame().setState(area)
+                elif self.mGo == 4:
+                    area = CArea1Game5()
+                    CGame().setState(area)
+                elif self.mGo == 5:
+                    area = CArea1Game6()
+                    CGame().setState(area)
 
-    def setPartida(self, aPartida):
-        self.mPartida = aPartida
-        #TODO: remove from here?
-        par = CGame().getPartida(self.mPartida)
-        character = par.getCharacter()
-        print 'get character of CGAME', character, self.mPartida
-        self.mPlayer = CBoyHall(character)
-        CGame().addChild(self.mPlayer)
-        #TODO no solo area 1
-        a1 = par.getArea(1)
-        for i in range(6):
-            s = CSprite()
-            if a1[i] == 0:
-                s.setImage(self.mStar1)
-            else:
-                s.setImage(self.mStar2)
-            s.setXY(730, 40)
-            self.mAreaStates.append(s)
-        CGame().addChild(self.mAreaStates[self.mCurrentSelectedArea])
         
     def destroy(self):
         #CGame().removeChild(self.mText)