some improves in hall view

1 files changed, 40 insertions, 21 deletions

diff --git a/src/game/HallState.py b/src/game/HallState.py
index 9d4908a..94f586e 100644
--- a/src/game/HallState.py
+++ b/src/game/HallState.py
@@ -31,7 +31,8 @@ import pygame
 
 class CHallState(CGameState):
 
-    mBackground = None    
+    mBackground = None
+    mBackgroundList = []
     mInstructions = None
     #mX = 10
     mButtonBack = None
@@ -40,7 +41,7 @@ class CHallState(CGameState):
     
     mArea1 = None
     
-    mFrameDoor0101 = []
+    #mFrameDoor0101 = []
     
     AREA1_POLYGON = [(402,94), (961,94), (961,631), (402,631)]
         
@@ -64,34 +65,37 @@ class CHallState(CGameState):
         self.mButtonBack.set_text("Volver")    #_('BACK Credits')
         CGame().addChild(self.mButtonBack)
         
-        self.mBackground = CImage.loadImage('assets/images/hall/A1-Pasillo-1.png', False)
-        CGame().setBackground(self.mBackground)
+        self.mBackgroundList.append(CImage.loadImage('assets/images/hall/A1-Pasillo-1.png', False))
+        self.mBackgroundList.append(CImage.loadImage('assets/images/hall/A1-Pasillo-2.png', False))
+        self.mBackgroundList.append(CImage.loadImage('assets/images/hall/A1-Pasillo-3.png', False))
+        self.mBackgroundList.append(CImage.loadImage('assets/images/hall/A1-Pasillo-4.png', False))
+        self.mBackgroundList.append(CImage.loadImage('assets/images/hall/A1-Pasillo-5.png', False))
+        self.mBackgroundList.append(CImage.loadImage('assets/images/hall/A1-Pasillo-6.png', 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', True)
+        self.mFrameImageDoor = Image.loadImage('assets/images/hall/A1-puerta-resaltada.png')
         self.mDoor.setImage(self.mFrameImageDoor)
         self.mDoorIs = False
+        
+        self.mLeftArrow = CSprite()
+        self.mLeftArrow.setXY(10, 400)
+        self.mImageLeftArrow = Image.loadImage('assets/images/hall/arrow.png')
+        self.mLeftArrow.setImage(self.mImageLeftArrow)
+        CGame().addChild(self.mLeftArrow)
+        
+        self.mRightArrow = CSprite()
+        self.mRightArrow.setXY(1060, 400)
+        self.mImageRightArrow = pygame.transform.flip(self.mImageLeftArrow, True, False)
+        self.mRightArrow.setImage(self.mImageRightArrow)
+        CGame().addChild(self.mRightArrow)
                 
         self.mPlayer = CBoyHall()
         CGame().addChild(self.mPlayer)
         
-        """self.mText = CMultiLabel()
-        self.mText.textLines = [
-            "dlkjfkljflk dslkdsj dsl",
-            "lkjdkldjdslk dslkdjd ",
-            "sadsakjd salkdjsa.",
-            "",
-            "dsalkjd ksajdlksjd lsk"
-            "dskldsjfkjd f d."]
-        
-        self.mText.size = (400, 300)
-        self.mText.fgColor = (0xFF, 0xFF, 0xFF)
-        self.mText.bgColor = (0, 0, 0)
-        self.mText.center = (320, 200)
-        self.mText.createImage()
-        CGame().addChild(self.mText)"""
         
     def update(self):
         #print "menu update"
@@ -103,7 +107,22 @@ class CHallState(CGameState):
             CGame().setState(ms)
             return
         
-        if (CMath.pointInsidePolygon(CMouse().getX(), CMouse().getY(), self.AREA1_POLYGON)):
+        elif self.mLeftArrow.clicked():
+            print 'previous game'
+            self.mCurrentSelectedArea = self.mCurrentSelectedArea - 1
+            CGame().setBackground(self.mBackgroundList[self.mCurrentSelectedArea])
+            self.mPlayer.mDestX = 1000
+            self.mPlayer.setXY(1400, 500)
+            #self.mPlayer.setState(1)
+            
+        elif self.mRightArrow.clicked():
+            print 'next game'
+            self.mCurrentSelectedArea = self.mCurrentSelectedArea + 1
+            CGame().setBackground(self.mBackgroundList[self.mCurrentSelectedArea])
+            self.mPlayer.mDestX = 200
+            self.mPlayer.setXY(-200, 500)
+        
+        elif (CMath.pointInsidePolygon(CMouse().getX(), CMouse().getY(), self.AREA1_POLYGON)):
             if not(self.mDoorIs):
                 CGame().addChild(self.mDoor)
                 self.mDoorIs = True