fix all labels on a1g1

1 files changed, 23 insertions, 29 deletions

diff --git a/src/game/Area1Game1.py b/src/game/Area1Game1.py
index 7d76bf3..b0afb75 100644
--- a/src/game/Area1Game1.py
+++ b/src/game/Area1Game1.py
@@ -24,7 +24,6 @@ STATE_RETURN = 3
 STATE_OK = 4
 
 
-#Piece class hereda de CSprite
 class Piece(CSprite):
 
 
@@ -63,7 +62,6 @@ class Piece(CSprite):
             self.setXY(x, y)
             if self.clicked():
                 d = Math.dist(self.mPos.getX() , self.mPos.getY(), self.mDest.getX(), self.mDest.getY()) 
-
                 if (d < self.MIN_DISTANCE):
                     self.setState(STATE_ADJUST)
                 else:
@@ -71,18 +69,12 @@ class Piece(CSprite):
                     self.setState(STATE_RETURN)
                 self.mParent.mActivePiece = None
 
-
         elif (self.mState == STATE_ADJUST):
             if (Math.dist(self.mPos.getX() , self.mPos.getY(), self.mDest.getX(), self.mDest.getY()) < self.RADIUS_COLLISION):
-
-                
-                option = self.mParent.mListOptions[self.mNum]
-                CGame().addChild(option)
                 self.setState(STATE_OK)
                 self.mParent.mGood = self.mParent.mGood + 1
                 self.mParent.mPoints.set_goods(self.mParent.mGood)
                 
-
         elif (self.mState == STATE_RETURN):
             dist = Math.dist(self.mPos.getX() , self.mPos.getY(), self.mOrigin.getX(), self.mOrigin.getY())
             if (dist < self.RADIUS_COLLISION):
@@ -99,24 +91,24 @@ class Piece(CSprite):
     def setState(self, aState):
 
         if (aState == STATE_STALE):
-            o = CVector(self.mOrigin.getX(), self.mOrigin.getY())
-            self.setPosition(o)
+            #o = CVector(self.mOrigin.getX(), self.mOrigin.getY())
+            self.setPosition(self.mOrigin)
             #self.setXY(100, 200)
             self.mVel = CVector(0.0, 0.0)
         if (aState == STATE_DRAG):
             self.mVel = CVector(0.0, 0.0)
-            CGame().addChild(self.mParent.mOption1)
+            CGame().addChild(self.mParent.mListOptions[self.mNum])
         if (aState == STATE_ADJUST):
             self.setVelXY((self.mDest.getX() - self.mPos.getX()) / self.TIME_ADJUST, 
             (self.mDest.getY() - self.mPos.getY()) / self.TIME_ADJUST)
+            CGame().removeChild(self.mParent.mListOptions[self.mNum])
         if (aState == STATE_RETURN):
-           
             vec = CVector(self.mOrigin.getX() - self.mPos.getX(), self.mOrigin.getY() - self.mPos.getY())
             vec.normalize()
             dist = Math.dist(self.mOrigin.getX(), self.mOrigin.getY(), self.mPos.getX(), self.mPos.getY())
             vec.mul(dist/self.TIME_ADJUST)
             self.setVelXY(vec.getX(), vec.getY())
-            CGame().removeChild(self.mParent.mOption1)
+            CGame().removeChild(self.mParent.mListOptions[self.mNum])
             
         if (aState == STATE_OK):
             self.setPosition(self.mDest)
@@ -170,32 +162,32 @@ class CArea1Game1(CGameState):
         piece.loadImage('assets/images/a1g1/A1G1-mamas.png')
         self.mListPieces.append(piece)
 
-        piece = Piece(self, 0, (630.0, 655.0), (244.0, 534.0))
+        piece = Piece(self, 1, (630.0, 655.0), (244.0, 534.0))
         piece.loadImage('assets/images/a1g1/A1G1-ovarios.png')
         self.mListPieces.append(piece)
 
-        piece = Piece(self, 0, (600.0, 655.0), (244.0, 544.0))
+        piece = Piece(self, 2, (600.0, 655.0), (244.0, 544.0))
         piece.loadImage('assets/images/a1g1/A1G1-utero.png')
         self.mListPieces.append(piece)
         
-        piece = Piece(self, 0, (630.0, 655.0), (250.0, 614.0))
+        piece = Piece(self, 3, (630.0, 655.0), (250.0, 614.0))
         piece.loadImage('assets/images/a1g1/A1G1-vagina.png')
         self.mListPieces.append(piece)
         
         #hombre
-        piece = Piece(self, 0, (600.0, 665.0), (927.0, 650.0))
+        piece = Piece(self, 4, (600.0, 665.0), (927.0, 650.0))
         piece.loadImage('assets/images/a1g1/A1G1-pene.png')
         self.mListPieces.append(piece)
         
-        piece = Piece(self, 0, (630.0, 665.0), (927.0, 588.0))
+        piece = Piece(self, 5, (630.0, 665.0), (927.0, 588.0))
         piece.loadImage('assets/images/a1g1/A1G1-prostata.png')
         self.mListPieces.append(piece)
         
-        piece = Piece(self, 0, (600.0, 665.0), (927.0, 656.0))
+        piece = Piece(self, 6, (600.0, 665.0), (927.0, 656.0))
         piece.loadImage('assets/images/a1g1/A1G1-testiculos.png')
         self.mListPieces.append(piece)
         
-        piece = Piece(self, 0, (630.0, 665.0), (927.0, 606.0))
+        piece = Piece(self, 7, (630.0, 665.0), (927.0, 606.0))
         piece.loadImage('assets/images/a1g1/A1G1-vesiculas.png')
         self.mListPieces.append(piece)
         
@@ -205,15 +197,17 @@ class CArea1Game1(CGameState):
             CGame().addChild(p)
        
         # load the options
-        self.mOption1 = CLabel()
-        self.mOption1.bgColor = (0x99, 0x99, 0x66)
-        self.mOption1.fgColor = (0xFF, 0xFF, 0xFF)
-        self.mOption1.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28)
-        self.mOption1.set_center((600, 450))
-        self.mOption1.set_size((200, 40))
-        self.mOption1.set_text('Mamas')
-        self.mListOptions.append(self.mOption1)
-        #CGame().addChild(self.mOption1)
+        pieces = [_('Mamas'), _('Ovarios'), _('Utero'), _('Vagina')]
+        pieces = pieces + [_('Pene'), _('Próstata'), _('Testículos'), _('Vesículas')]
+        for name in pieces:
+            op = CLabel()
+            op.bgColor = (0x99, 0x99, 0x66)
+            op.fgColor = (0xFF, 0xFF, 0xFF)
+            op.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28)
+            op.set_center((600, 450))
+            op.set_size((200, 40))
+            op.set_text(unicode(name, 'UTF-8'))
+            self.mListOptions.append(op)
         
         
         self.mPoints = CPoints()