add to the rest the back button

7 files changed, 141 insertions, 64 deletions

diff --git a/src/game/Area1Game1.py b/src/game/Area1Game1.py
index 868fd58..8aa0402 100644
--- a/src/game/Area1Game1.py
+++ b/src/game/Area1Game1.py
@@ -173,11 +173,11 @@ class CArea1Game1(CGameState):
         self.mBackImageN = Image.loadImage('assets/images/back.png')
         self.mBackImageB = Image.loadImage('assets/images/back_big.png')
         
-        self.mButtonBackA1G1 = CSprite()
-        self.mButtonBackA1G1.setRegistrationPointOffset(22, 22)
-        self.mButtonBackA1G1.setXY(1170, 30)
-        self.mButtonBackA1G1.setImage(self.mBackImageN)
-        CGame().addChild(self.mButtonBackA1G1)
+        self.mButtonBack = CSprite()
+        self.mButtonBack.setRegistrationPointOffset(22, 22)
+        self.mButtonBack.setXY(1170, 30)
+        self.mButtonBack.setImage(self.mBackImageN)
+        CGame().addChild(self.mButtonBack)
         
         # load the pieces
         # parameters: aParent, aNum, aOrigin, aDestine
@@ -266,20 +266,20 @@ class CArea1Game1(CGameState):
         if not(self.mAlphaSet):
 
             
-            if self.mButtonBackA1G1.mouseOver():
+            if self.mButtonBack.mouseOver():
                 if not(self.mBsetted):
                     self.mBsetted = True
                     self.mNsetted = False
-                    self.mButtonBackA1G1.setRegistrationPointOffset(27, 27)
-                    self.mButtonBackA1G1.setImage(self.mBackImageB)
+                    self.mButtonBack.setRegistrationPointOffset(27, 27)
+                    self.mButtonBack.setImage(self.mBackImageB)
             else:
                 if not(self.mNsetted):
                     self.mBsetted = False
                     self.mNSetted = True
-                    self.mButtonBackA1G1.setRegistrationPointOffset(22, 22)
-                    self.mButtonBackA1G1.setImage(self.mBackImageN)
+                    self.mButtonBack.setRegistrationPointOffset(22, 22)
+                    self.mButtonBack.setImage(self.mBackImageN)
                 
-            if self.mButtonBackA1G1.clicked():
+            if self.mButtonBack.clicked():
                 #print "clicked clicked back of a1g1"
                 #cs = CHelpState()
                 ms = MenuState.CMenuState()
@@ -304,7 +304,7 @@ class CArea1Game1(CGameState):
         CGameState.destroy(self)
         #self.mInstructions.destroy()
         self.mInstructions = None
-        CGame().removeChild(self.mButtonBackA1G1)
+        CGame().removeChild(self.mButtonBack)
         CGame().removeChild(self.mPoints)
         CGame().removeChild(self.mBox)
         CGame().removeChild(self.mElisa)
diff --git a/src/game/Area1Game3.py b/src/game/Area1Game3.py
index 52d5760..c79ecb8 100644
--- a/src/game/Area1Game3.py
+++ b/src/game/Area1Game3.py
@@ -22,7 +22,7 @@ class CArea1Game3(CGameState):
         
         self.mBackground = None
         self.mInstructions = None
-        self.mButtonBackA1G3 = None
+        self.mButtonBack = None
         self.mLabelQuestion = None
         self.mButtonTrue = None
         self.mButtonFalse = None
@@ -77,13 +77,17 @@ 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', 28)
-        self.mButtonBackA1G3.set_center((120, 40))
-        self.mButtonBackA1G3.set_size((200, 40))  
-        self.mButtonBackA1G3.set_text(_('Volver'))
-        CGame().addChild(self.mButtonBackA1G3)
+        self.mBsetted = False
+        self.mNsetted = True
+                
+        self.mBackImageN = Image.loadImage('assets/images/back.png')
+        self.mBackImageB = Image.loadImage('assets/images/back_big.png')
+        
+        self.mButtonBack = CSprite()
+        self.mButtonBack.setRegistrationPointOffset(22, 22)
+        self.mButtonBack.setXY(1170, 30)
+        self.mButtonBack.setImage(self.mBackImageN)
+        CGame().addChild(self.mButtonBack)
 
         self.mLabelQuestion = Globe((500, 250), pico='None', text=' ')
         self.mLabelQuestion.set_center((600, 250))
@@ -147,7 +151,20 @@ class CArea1Game3(CGameState):
         
         self.time = self.time + 1
         
-        if self.mButtonBackA1G3.clicked():
+        if self.mButtonBack.mouseOver():
+            if not(self.mBsetted):
+                self.mBsetted = True
+                self.mNsetted = False
+                self.mButtonBack.setRegistrationPointOffset(27, 27)
+                self.mButtonBack.setImage(self.mBackImageB)
+        else:
+            if not(self.mNsetted):
+                self.mBsetted = False
+                self.mNSetted = True
+                self.mButtonBack.setRegistrationPointOffset(22, 22)
+                self.mButtonBack.setImage(self.mBackImageN)
+        
+        if self.mButtonBack.clicked():
             print "clicked back of a1g3"
             #cs = CHelpState()
             ms = MenuState.CMenuState()
@@ -256,7 +273,7 @@ class CArea1Game3(CGameState):
         #self.mInstructions.destroy()
         self.mInstructions = None
 
-        CGame().removeChild(self.mButtonBackA1G3)
+        CGame().removeChild(self.mButtonBack)
         CGame().removeChild(self.mLabelQuestion)
         CGame().removeChild(self.mButtonTrue)
         CGame().removeChild(self.mButtonFalse)
diff --git a/src/game/Area1Game4.py b/src/game/Area1Game4.py
index aec2c6e..10b8be3 100644
--- a/src/game/Area1Game4.py
+++ b/src/game/Area1Game4.py
@@ -68,13 +68,17 @@ class CArea1Game4(CGameState):
         self.mBadSprite.setXY(300, 100)
         self.mBadSprite.loadImage('assets/images/a1g4/bad.png')
         
-        self.mButtonBackA1G4 = CButton()
-        self.mButtonBackA1G4.set_bgColor((0x99, 0x99, 0x66))
-        self.mButtonBackA1G4.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 20)
-        self.mButtonBackA1G4.set_center((120, 40))
-        self.mButtonBackA1G4.set_size((200, 40))  
-        self.mButtonBackA1G4.set_text(_('Volver'))
-        CGame().addChild(self.mButtonBackA1G4)
+        self.mBsetted = False
+        self.mNsetted = True
+                
+        self.mBackImageN = Image.loadImage('assets/images/back.png')
+        self.mBackImageB = Image.loadImage('assets/images/back_big.png')
+        
+        self.mButtonBack = CSprite()
+        self.mButtonBack.setRegistrationPointOffset(22, 22)
+        self.mButtonBack.setXY(1170, 30)
+        self.mButtonBack.setImage(self.mBackImageN)
+        CGame().addChild(self.mButtonBack)
         
         self.mButtonList[0].set_center((350, 550))
         self.mButtonList[1].set_center((600, 550))
@@ -102,7 +106,20 @@ class CArea1Game4(CGameState):
 
         CGameState.update(self)
         
-        if self.mButtonBackA1G4.clicked():
+        if self.mButtonBack.mouseOver():
+            if not(self.mBsetted):
+                self.mBsetted = True
+                self.mNsetted = False
+                self.mButtonBack.setRegistrationPointOffset(27, 27)
+                self.mButtonBack.setImage(self.mBackImageB)
+        else:
+            if not(self.mNsetted):
+                self.mBsetted = False
+                self.mNSetted = True
+                self.mButtonBack.setRegistrationPointOffset(22, 22)
+                self.mButtonBack.setImage(self.mBackImageN)
+        
+        if self.mButtonBack.clicked():
             ms = MenuState.CMenuState()
             CGame().setState(ms)
             return
@@ -155,7 +172,7 @@ class CArea1Game4(CGameState):
     def destroy(self):
         CGameState.destroy(self)
 
-        CGame().removeChild(self.mButtonBackA1G4)
+        CGame().removeChild(self.mButtonBack)
         CGame().removeChild(self.mLabelQuestion)
         CGame().removeChild(self.mPoints)
         CGame().removeChild(self.mBook)
diff --git a/src/game/Area1Game5.py b/src/game/Area1Game5.py
index 2035bcb..bb03acd 100644
--- a/src/game/Area1Game5.py
+++ b/src/game/Area1Game5.py
@@ -67,13 +67,17 @@ class CArea1Game5(CGameState):
         # randomize it
         random.shuffle(self.mboy_list)
         
-        self.mButtonBackA1G5 = CButton()
-        self.mButtonBackA1G5.set_bgColor((0x99, 0x99, 0x66))
-        self.mButtonBackA1G5.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28)
-        self.mButtonBackA1G5.set_center((120, 40))
-        self.mButtonBackA1G5.set_size((200, 40))  
-        self.mButtonBackA1G5.set_text(_('Volver'))
-        CGame().addChild(self.mButtonBackA1G5)
+        self.mBsetted = False
+        self.mNsetted = True
+                
+        self.mBackImageN = Image.loadImage('assets/images/back.png')
+        self.mBackImageB = Image.loadImage('assets/images/back_big.png')
+        
+        self.mButtonBack = CSprite()
+        self.mButtonBack.setRegistrationPointOffset(22, 22)
+        self.mButtonBack.setXY(1170, 30)
+        self.mButtonBack.setImage(self.mBackImageN)
+        CGame().addChild(self.mButtonBack)
 
         self.mLabelQuestion = Globe((500, 150), pico='None', text=' ')
         self.mLabelQuestion.set_center((600, 250))
@@ -130,10 +134,22 @@ class CArea1Game5(CGameState):
     def update(self):
         CGameState.update(self)
 
-        
         self.time = self.time + 1
         
-        if self.mButtonBackA1G5.clicked():
+        if self.mButtonBack.mouseOver():
+            if not(self.mBsetted):
+                self.mBsetted = True
+                self.mNsetted = False
+                self.mButtonBack.setRegistrationPointOffset(27, 27)
+                self.mButtonBack.setImage(self.mBackImageB)
+        else:
+            if not(self.mNsetted):
+                self.mBsetted = False
+                self.mNSetted = True
+                self.mButtonBack.setRegistrationPointOffset(22, 22)
+                self.mButtonBack.setImage(self.mBackImageN)
+        
+        if self.mButtonBack.clicked():
             print "clicked back of a1g5"
             #cs = CHelpState()
             ms = MenuState.CMenuState()
@@ -228,7 +244,7 @@ class CArea1Game5(CGameState):
         #self.mInstructions.destroy()
         self.mInstructions = None
 
-        CGame().removeChild(self.mButtonBackA1G5)
+        CGame().removeChild(self.mButtonBack)
         CGame().removeChild(self.mLabelQuestion)
         CGame().removeChild(self.mButtonTrue)
         CGame().removeChild(self.mButtonFalse)
diff --git a/src/game/Area1Game6.py b/src/game/Area1Game6.py
index 77a31c8..fed75d1 100644
--- a/src/game/Area1Game6.py
+++ b/src/game/Area1Game6.py
@@ -2,7 +2,6 @@
 
 import pygame
 from api.Sprite2 import CSprite
-from api.Button import CButton
 from api.Points import CPoints
 from api.MultiLabel import CMultiLabel
 from api.Mouse import CMouse
@@ -13,7 +12,6 @@ from api.Game import CGame
 from api.GameState import CGameState
 import MenuState
 
-from gettext import gettext as _
 
 from assets.data import area1game6_data
 
@@ -166,16 +164,16 @@ class CArea1Game6(CGameState):
         for i in range(10):
             self.mListHelps.insert(i, None)
             
-        #for i in range(18):
-        #    self.mListPieces.insert(i, None)
-            
+        self.mBsetted = False
+        self.mNsetted = True
+                
+        self.mBackImageN = Image.loadImage('assets/images/back.png')
+        self.mBackImageB = Image.loadImage('assets/images/back_big.png')
         
-        self.mButtonBack = CButton()
-        self.mButtonBack.set_bgColor((0x99, 0x99, 0x66))
-        self.mButtonBack.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 20)
-        self.mButtonBack.set_center((120, 40))
-        self.mButtonBack.set_size((200, 40))  
-        self.mButtonBack.set_text(_('Volver'))
+        self.mButtonBack = CSprite()
+        self.mButtonBack.setRegistrationPointOffset(22, 22)
+        self.mButtonBack.setXY(1170, 30)
+        self.mButtonBack.setImage(self.mBackImageN)
         CGame().addChild(self.mButtonBack)
         
         self.mBackground = Image.loadImage('assets/images/a1g6/A1G6-fondo.jpg', False)
@@ -292,6 +290,19 @@ class CArea1Game6(CGameState):
     def update(self):
         #print "menu update"
         CGameState.update(self)
+        
+        if self.mButtonBack.mouseOver():
+            if not(self.mBsetted):
+                self.mBsetted = True
+                self.mNsetted = False
+                self.mButtonBack.setRegistrationPointOffset(27, 27)
+                self.mButtonBack.setImage(self.mBackImageB)
+        else:
+            if not(self.mNsetted):
+                self.mBsetted = False
+                self.mNSetted = True
+                self.mButtonBack.setRegistrationPointOffset(22, 22)
+                self.mButtonBack.setImage(self.mBackImageN)
        
         if self.mButtonBack.clicked():
             print "clicked clicked back of a1g6"
diff --git a/src/game/Area2Game2.py b/src/game/Area2Game2.py
index b8a107b..75286b4 100644
--- a/src/game/Area2Game2.py
+++ b/src/game/Area2Game2.py
@@ -42,13 +42,17 @@ class CArea2Game2(CGameState):
             q = (unicode(t[0], 'UTF-8'), t[1])
             self.list_questions.append(q)
         
-        self.mButtonBackA2G2 = CButton()
-        self.mButtonBackA2G2.set_bgColor((0x99, 0x99, 0x66))
-        self.mButtonBackA2G2.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 20)
-        self.mButtonBackA2G2.set_center((110, 650))
-        self.mButtonBackA2G2.set_size((200, 40))  
-        self.mButtonBackA2G2.set_text(_('Volver'))
-        CGame().addChild(self.mButtonBackA2G2)
+        self.mBsetted = False
+        self.mNsetted = True
+                
+        self.mBackImageN = Image.loadImage('assets/images/back.png')
+        self.mBackImageB = Image.loadImage('assets/images/back_big.png')
+        
+        self.mButtonBack = CSprite()
+        self.mButtonBack.setRegistrationPointOffset(22, 22)
+        self.mButtonBack.setXY(1170, 30)
+        self.mButtonBack.setImage(self.mBackImageN)
+        CGame().addChild(self.mButtonBack)
         
         self.mWheel = CSprite()
         self.mWheel.loadImage('assets/images/a2g2/rueda.png', False)
@@ -101,9 +105,22 @@ class CArea2Game2(CGameState):
         
     def update(self):
 
-        CGameState.update(self)
-
-        if self.mButtonBackA2G2.clicked():
+        CGameState.update(self)        
+        
+        if self.mButtonBack.mouseOver():
+            if not(self.mBsetted):
+                self.mBsetted = True
+                self.mNsetted = False
+                self.mButtonBack.setRegistrationPointOffset(27, 27)
+                self.mButtonBack.setImage(self.mBackImageB)
+        else:
+            if not(self.mNsetted):
+                self.mBsetted = False
+                self.mNSetted = True
+                self.mButtonBack.setRegistrationPointOffset(22, 22)
+                self.mButtonBack.setImage(self.mBackImageN)
+        
+        if self.mButtonBack.clicked():
             ms = MenuState.CMenuState()
             CGame().setState(ms)
             return
@@ -194,7 +211,7 @@ class CArea2Game2(CGameState):
     def destroy(self):
         CGameState.destroy(self)
 
-        CGame().removeChild(self.mButtonBackA2G2)
+        CGame().removeChild(self.mButtonBack)
         CGame().removeChild(self.mButtonStop)
         for i in range(8):
             CGame().removeChild(self.mWheelUsed[i])
diff --git a/src/game/CreditsState.py b/src/game/CreditsState.py
index f049ad5..d5563cb 100644
--- a/src/game/CreditsState.py
+++ b/src/game/CreditsState.py
@@ -4,7 +4,6 @@ import pygame
 import MenuState
 from api.GameState import CGameState
 from api.Game import CGame
-from api.Button import CButton
 from api.Sprite2 import CSprite
 from api.MultiLabel import CMultiLabel
 import api.Image as Image