show state of each game in hall state

1 files changed, 32 insertions, 7 deletions

diff --git a/src/game/HallState.py b/src/game/HallState.py
index 126e9fb..c0a2bed 100644
--- a/src/game/HallState.py
+++ b/src/game/HallState.py
@@ -40,6 +40,7 @@ class CHallState(CGameState):
         #print self.mX
         
         self.mPartida = None
+        self.mAreaStates = []
         
         self.mCurrentSelectedArea = 0
         
@@ -67,12 +68,15 @@ class CHallState(CGameState):
         self.mDoor.setImage(self.mFrameImageDoor)
         self.mDoorIs = False
         
-        self.mStar = CSprite()
+        """self.mStar = CSprite()
         #self.mStar.setXY(400, 50)
         self.mStar.setXY(730, 40)
         star = Image.loadImage('assets/images/hall/star1.png')
         self.mStar.setImage(star)
-        CGame().addChild(self.mStar)
+        CGame().addChild(self.mStar)"""
+        
+        self.mStar1 = Image.loadImage('assets/images/hall/star1.png')
+        self.mStar2 = Image.loadImage('assets/images/hall/star2.png')
         
         self.mLeftArrow = CSprite()
         self.mLeftArrow.setXY(10, 400)
@@ -99,12 +103,13 @@ class CHallState(CGameState):
         
         elif self.mLeftArrow.clicked():
             print 'previous game'
+            CGame().removeChild(self.mAreaStates[self.mCurrentSelectedArea])
             self.mCurrentSelectedArea = self.mCurrentSelectedArea - 1
             if self.mCurrentSelectedArea < 0:
                 self.mCurrentSelectedArea = 5
                 #self.mPlayer.setVelXY(-20, 0)
                 self.mPlayer.setXY(1000, 500)
-                #else:
+                    
             CGame().setBackground(self.mBackgroundList[self.mCurrentSelectedArea])
             self.mPlayer.mDestX = 1000
             self.mPlayer.mAnim.init(6, 3, True, 3)
@@ -112,20 +117,25 @@ class CHallState(CGameState):
             self.mPlayer.setVelXY(-5, 0)
             self.mPlayer.setXY(1400, 500)
             
+            CGame().addChild(self.mAreaStates[self.mCurrentSelectedArea])
+            
         elif self.mRightArrow.clicked():
             print 'next game'
+            CGame().removeChild(self.mAreaStates[self.mCurrentSelectedArea])
             self.mCurrentSelectedArea = self.mCurrentSelectedArea + 1
             if self.mCurrentSelectedArea > 5:
                 self.mCurrentSelectedArea = 0
                 #self.mPlayer.setVelXY(20, 0)
                 self.mPlayer.setXY(200, 500)
-                #else:
+                
             CGame().setBackground(self.mBackgroundList[self.mCurrentSelectedArea])
             self.mPlayer.mDestX = 200
             self.mPlayer.mAnim.init(3, 3, True, 0)
             self.mPlayer.mLastSense = 1
             self.mPlayer.setVelXY(5, 0)
             self.mPlayer.setXY(-200, 500)
+            
+            CGame().addChild(self.mAreaStates[self.mCurrentSelectedArea])
         
         elif (CMath.pointInsidePolygon(CMouse().getX(), CMouse().getY(), self.AREA1_POLYGON)):
             if not(self.mDoorIs):
@@ -144,10 +154,22 @@ class CHallState(CGameState):
     def setPartida(self, aPartida):
         self.mPartida = aPartida
         #TODO: remove from here?
-        character = CGame().getCharacter(self.mPartida)
+        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)
@@ -167,8 +189,11 @@ class CHallState(CGameState):
         CGame().removeChild(self.mPlayer)
         self.mPlayer.destroy()
         self.mPlayer = None
-        CGame().removeChild(self.mStar)
-        self.mStar = None
+        #CGame().removeChild(self.mStar)
+        for e in self.mAreaStates:
+            CGame().removeChild(e)
+        self.mStar1 = None
+        self.mStar2 = None
         self.mBackground = None
         
     def doEvents(self, aEvent):