add mouse over effect to hall arrows

4 files changed, 49 insertions, 20 deletions

diff --git a/src/assets/images/hall/arrow.png b/src/assets/images/hall/arrow.png
deleted file mode 100644
index eca31dd..0000000
--- a/src/assets/images/hall/arrow.png
+++ /dev/null
diff --git a/src/assets/images/hall/left_big.png b/src/assets/images/hall/left_big.png
new file mode 100644
index 0000000..ba24c58
--- /dev/null
+++ b/src/assets/images/hall/left_big.png
diff --git a/src/assets/images/hall/left_small.png b/src/assets/images/hall/left_small.png
new file mode 100644
index 0000000..54f5777
--- /dev/null
+++ b/src/assets/images/hall/left_small.png
diff --git a/src/game/HallState.py b/src/game/HallState.py
index ac5cc25..bc4ca0a 100644
--- a/src/game/HallState.py
+++ b/src/game/HallState.py
@@ -25,10 +25,15 @@ class CHallState(CGameState):
         self.mBackground = None
         self.mBackgroundList = []
         self.mInstructions = None
-        #mX = 10
         self.mButtonBack = None
         self.mBsetted = False
         self.mNsetted = True
+        
+        self.mBLsetted = False
+        self.mSLsetted = True
+        self.mBRsetted = False
+        self.mSRsetted = True
+        
         self.mPlayer = None    
         self.mtext = None
         self.mGo = None
@@ -48,13 +53,11 @@ class CHallState(CGameState):
         self.mButtonBack.setImage(self.mBackImageN)
         CGame().addChild(self.mButtonBack)
         
-        self.mBackgroundList.append(CImage.loadImage('assets/images/hall/A1-Pasillo-1.jpg', False))
-        self.mBackgroundList.append(CImage.loadImage('assets/images/hall/A1-Pasillo-2.jpg', False))
-        self.mBackgroundList.append(CImage.loadImage('assets/images/hall/A1-Pasillo-3.jpg', False))
-        self.mBackgroundList.append(CImage.loadImage('assets/images/hall/A1-Pasillo-4.jpg', False))
-        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))
-        
+        for i in range(1, 7):
+            path = 'assets/images/hall/A1-Pasillo-' + str(i) + '.jpg'
+            img = CImage.loadImage(path, False)
+            self.mBackgroundList.append(img)
+       
         self.mDoor = CSprite()
         self.mDoor.setXY(400, 50)
         self.mFrameImageDoor = Image.loadImage('assets/images/hall/A1-puerta-resaltada.png')
@@ -63,16 +66,21 @@ class CHallState(CGameState):
         self.mStar1 = Image.loadImage('assets/images/hall/star1.png')
         self.mStar2 = Image.loadImage('assets/images/hall/star2.png')
         
+        self.mSmallLeftArrow = Image.loadImage('assets/images/hall/left_small.png')
+        self.mBigLeftArrow = Image.loadImage('assets/images/hall/left_big.png')
+        self.mSmallRightArrow = pygame.transform.flip(self.mSmallLeftArrow, True, False)
+        self.mBigRightArrow = pygame.transform.flip(self.mBigLeftArrow, True, False)
+        
         self.mLeftArrow = CSprite()
-        self.mLeftArrow.setXY(10, 400)
-        self.mImageLeftArrow = Image.loadImage('assets/images/hall/arrow.png')
-        self.mLeftArrow.setImage(self.mImageLeftArrow)
+        self.mLeftArrow.setXY(75, 422)
+        self.mLeftArrow.setRegistrationPointOffset(55, 23)
+        self.mLeftArrow.setImage(self.mSmallLeftArrow)
         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)
+        self.mRightArrow.setXY(1125, 422)
+        self.mRightArrow.setRegistrationPointOffset(55, 23)
+        self.mRightArrow.setImage(self.mSmallRightArrow)
         CGame().addChild(self.mRightArrow)
 
         number = CGame().getCurrentPartida()
@@ -115,16 +123,39 @@ class CHallState(CGameState):
                 self.mNSetted = True
                 self.mButtonBack.setRegistrationPointOffset(22, 22)
                 self.mButtonBack.setImage(self.mBackImageN)
+
+        if self.mLeftArrow.mouseOver():
+            if not(self.mBLsetted):
+                self.mBLsetted = True
+                self.mSLsetted = False
+                self.mLeftArrow.setRegistrationPointOffset(65, 27)
+                self.mLeftArrow.setImage(self.mBigLeftArrow)
+        else:
+            if not(self.mSLsetted):
+                self.mBLsetted = False
+                self.mSLsetted = True
+                self.mLeftArrow.setRegistrationPointOffset(55, 23)
+                self.mLeftArrow.setImage(self.mSmallLeftArrow)
+
+        if self.mRightArrow.mouseOver():
+            if not(self.mBRsetted):
+                self.mBRsetted = True
+                self.mSRsetted = False
+                self.mRightArrow.setRegistrationPointOffset(65, 27)
+                self.mRightArrow.setImage(self.mBigRightArrow)
+        else:
+            if not(self.mSRsetted):
+                self.mBRsetted = False
+                self.mSRsetted = True
+                self.mRightArrow.setRegistrationPointOffset(55, 23)
+                self.mRightArrow.setImage(self.mSmallRightArrow)
        
         if self.mButtonBack.clicked():
-            #print "clicked back......"
-            #ms = MenuState.CMenuState()
             cs = SelectAreaState.CSelectAreaState()
             CGame().setState(cs)
             return
         
         elif self.mLeftArrow.clicked():
-            #print 'previous game'
             CGame().removeChild(self.mAreaStates[self.mCurrentSelectedArea])
             self.mCurrentSelectedArea = self.mCurrentSelectedArea - 1
             if self.mCurrentSelectedArea < 0:
@@ -143,7 +174,6 @@ class CHallState(CGameState):
             return
             
         elif self.mRightArrow.clicked():
-            #print 'next game'
             CGame().removeChild(self.mAreaStates[self.mCurrentSelectedArea])
             self.mCurrentSelectedArea = self.mCurrentSelectedArea + 1
             if self.mCurrentSelectedArea > 5:
@@ -204,8 +234,6 @@ class CHallState(CGameState):
 
         
     def destroy(self):
-        #CGame().removeChild(self.mText)
-        #self.mText = None
         CGameState.destroy(self)
         CGame().removeChild(self.mButtonBack)
         self.mButtonBack = None
@@ -227,3 +255,4 @@ class CHallState(CGameState):
         self.mStar1 = None
         self.mStar2 = None
         self.mBackground = None
+