fix a1g6 crucigrama

68 files changed, 66 insertions, 60 deletions

diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index a964922..ad5f58f 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -10,6 +10,7 @@ encoding//src/api/Vector.py=utf-8
 encoding//src/assets/data/area1game3_data.py=utf-8
 encoding//src/game/Area1Game1.py=utf-8
 encoding//src/game/Area1Game3.py=utf-8
+encoding//src/game/Area1Game6.py=utf-8
 encoding//src/game/Area1Game7.py=utf-8
 encoding//src/game/Area2Game2.py=utf-8
 encoding//src/game/CreditsState.py=utf-8
diff --git a/src/Main.py b/src/Main.py
index 7d305fa..51d45b3 100755
--- a/src/Main.py
+++ b/src/Main.py
@@ -17,14 +17,5 @@ def main():
     g.gameLoop()

     g.destroy()

         

-    #Change state:

-    #ls = CLevelState();

-    #CGame.setState(ls);

-    

-    #Singleton test.

-    #j = CGame(None)

-    #print g == j

-

-# Execute main() if this is the main program. 

 if __name__ == "__main__":

     main()
\ No newline at end of file
diff --git a/src/assets/images/a1g1/A1G1 fondo.png b/src/assets/images/a1g1/A1G1-back.png
index 354e753..354e753 100644
--- a/src/assets/images/a1g1/A1G1 fondo.png
+++ b/src/assets/images/a1g1/A1G1-back.png
diff --git a/src/assets/images/a1g2/JES-canion-hormonas.png b/src/assets/images/a1g2/JES-canion-hormonas.png
new file mode 100644
index 0000000..62547ff
--- /dev/null
+++ b/src/assets/images/a1g2/JES-canion-hormonas.png
diff --git a/src/assets/images/a1g2/JES-hormona-femenina.png b/src/assets/images/a1g2/JES-hormona-femenina.png
new file mode 100644
index 0000000..f920e34
--- /dev/null
+++ b/src/assets/images/a1g2/JES-hormona-femenina.png
diff --git a/src/assets/images/a1g2/JES-ninia-00.png b/src/assets/images/a1g2/JES-ninia-00.png
new file mode 100644
index 0000000..7d249ac
--- /dev/null
+++ b/src/assets/images/a1g2/JES-ninia-00.png
diff --git a/src/assets/images/a1g2/JES-ninia-01.png b/src/assets/images/a1g2/JES-ninia-01.png
new file mode 100644
index 0000000..1216acb
--- /dev/null
+++ b/src/assets/images/a1g2/JES-ninia-01.png
diff --git a/src/assets/images/a1g2/JES-ninia-02.png b/src/assets/images/a1g2/JES-ninia-02.png
new file mode 100644
index 0000000..a595694
--- /dev/null
+++ b/src/assets/images/a1g2/JES-ninia-02.png
diff --git a/src/assets/images/a1g2/JES-ninia-03.png b/src/assets/images/a1g2/JES-ninia-03.png
new file mode 100644
index 0000000..79aeab7
--- /dev/null
+++ b/src/assets/images/a1g2/JES-ninia-03.png
diff --git a/src/assets/images/a1g2/JES-ninia-04.png b/src/assets/images/a1g2/JES-ninia-04.png
new file mode 100644
index 0000000..82a8f2e
--- /dev/null
+++ b/src/assets/images/a1g2/JES-ninia-04.png
diff --git a/src/assets/images/a1g2/JES-ninia-05.png b/src/assets/images/a1g2/JES-ninia-05.png
new file mode 100644
index 0000000..01ee399
--- /dev/null
+++ b/src/assets/images/a1g2/JES-ninia-05.png
diff --git a/src/assets/images/a1g2/JES-ninia-06.png b/src/assets/images/a1g2/JES-ninia-06.png
new file mode 100644
index 0000000..c4bd370
--- /dev/null
+++ b/src/assets/images/a1g2/JES-ninia-06.png
diff --git a/src/assets/images/a1g2/JES-ninia-07.png b/src/assets/images/a1g2/JES-ninia-07.png
new file mode 100644
index 0000000..de449bd
--- /dev/null
+++ b/src/assets/images/a1g2/JES-ninia-07.png
diff --git a/src/assets/images/a1g2/JES-varon-00.png b/src/assets/images/a1g2/JES-varon-00.png
new file mode 100644
index 0000000..c33cbd8
--- /dev/null
+++ b/src/assets/images/a1g2/JES-varon-00.png
diff --git a/src/assets/images/a1g2/JES-varon-01.png b/src/assets/images/a1g2/JES-varon-01.png
new file mode 100644
index 0000000..6cd0e26
--- /dev/null
+++ b/src/assets/images/a1g2/JES-varon-01.png
diff --git a/src/assets/images/a1g2/JES-varon-02.png b/src/assets/images/a1g2/JES-varon-02.png
new file mode 100644
index 0000000..9871ffb
--- /dev/null
+++ b/src/assets/images/a1g2/JES-varon-02.png
diff --git a/src/assets/images/a1g2/JES-varon-03.png b/src/assets/images/a1g2/JES-varon-03.png
new file mode 100644
index 0000000..7ae9feb
--- /dev/null
+++ b/src/assets/images/a1g2/JES-varon-03.png
diff --git a/src/assets/images/a1g2/JES-varon-04.png b/src/assets/images/a1g2/JES-varon-04.png
new file mode 100644
index 0000000..dff4025
--- /dev/null
+++ b/src/assets/images/a1g2/JES-varon-04.png
diff --git a/src/assets/images/a1g2/JES-varon-05.png b/src/assets/images/a1g2/JES-varon-05.png
new file mode 100644
index 0000000..ce608e5
--- /dev/null
+++ b/src/assets/images/a1g2/JES-varon-05.png
diff --git a/src/assets/images/a1g2/JES-varon-06.png b/src/assets/images/a1g2/JES-varon-06.png
new file mode 100644
index 0000000..5ce7617
--- /dev/null
+++ b/src/assets/images/a1g2/JES-varon-06.png
diff --git a/src/assets/images/a1g2/JES-varon-07.png b/src/assets/images/a1g2/JES-varon-07.png
new file mode 100644
index 0000000..78a5d8c
--- /dev/null
+++ b/src/assets/images/a1g2/JES-varon-07.png
diff --git a/src/assets/images/a1g4/A1G4-libro.png b/src/assets/images/a1g4/A1G4-libro.png
new file mode 100644
index 0000000..b370977
--- /dev/null
+++ b/src/assets/images/a1g4/A1G4-libro.png
diff --git a/src/assets/images/a1g6/A1G6-base-crucigrama.png b/src/assets/images/a1g6/A1G6-base-crucigrama.png
new file mode 100644
index 0000000..8d80442
--- /dev/null
+++ b/src/assets/images/a1g6/A1G6-base-crucigrama.png
diff --git a/src/assets/images/a1g6/A1G6-fondo.png b/src/assets/images/a1g6/A1G6-fondo.png
new file mode 100644
index 0000000..c8cfc3d
--- /dev/null
+++ b/src/assets/images/a1g6/A1G6-fondo.png
diff --git a/src/assets/images/a1g6/A1G6-piezas_03.png b/src/assets/images/a1g6/A1G6-piezas_03.png
new file mode 100644
index 0000000..5600b3a
--- /dev/null
+++ b/src/assets/images/a1g6/A1G6-piezas_03.png
diff --git a/src/assets/images/a1g6/A1G6-piezas_04.png b/src/assets/images/a1g6/A1G6-piezas_04.png
new file mode 100644
index 0000000..ff0f9ec
--- /dev/null
+++ b/src/assets/images/a1g6/A1G6-piezas_04.png
diff --git a/src/assets/images/a1g6/A1G6-piezas_05.png b/src/assets/images/a1g6/A1G6-piezas_05.png
new file mode 100644
index 0000000..16c5556
--- /dev/null
+++ b/src/assets/images/a1g6/A1G6-piezas_05.png
diff --git a/src/assets/images/a1g6/A1G6-piezas_09.png b/src/assets/images/a1g6/A1G6-piezas_09.png
new file mode 100644
index 0000000..df55289
--- /dev/null
+++ b/src/assets/images/a1g6/A1G6-piezas_09.png
diff --git a/src/assets/images/a1g6/A1G6-piezas_10.png b/src/assets/images/a1g6/A1G6-piezas_10.png
new file mode 100644
index 0000000..4f18706
--- /dev/null
+++ b/src/assets/images/a1g6/A1G6-piezas_10.png
diff --git a/src/assets/images/a1g6/A1G6-piezas_11.png b/src/assets/images/a1g6/A1G6-piezas_11.png
new file mode 100644
index 0000000..8cd4d52
--- /dev/null
+++ b/src/assets/images/a1g6/A1G6-piezas_11.png
diff --git a/src/assets/images/a1g6/A1G6-piezas_16.png b/src/assets/images/a1g6/A1G6-piezas_16.png
new file mode 100644
index 0000000..52b96e2
--- /dev/null
+++ b/src/assets/images/a1g6/A1G6-piezas_16.png
diff --git a/src/assets/images/a1g6/A1G6-piezas_17.png b/src/assets/images/a1g6/A1G6-piezas_17.png
new file mode 100644
index 0000000..9be35e1
--- /dev/null
+++ b/src/assets/images/a1g6/A1G6-piezas_17.png
diff --git a/src/assets/images/a1g6/A1G6-piezas_18.png b/src/assets/images/a1g6/A1G6-piezas_18.png
new file mode 100644
index 0000000..d3e38fd
--- /dev/null
+++ b/src/assets/images/a1g6/A1G6-piezas_18.png
diff --git a/src/assets/images/a1g6/A1G6-piezas_19.png b/src/assets/images/a1g6/A1G6-piezas_19.png
new file mode 100644
index 0000000..1e217f6
--- /dev/null
+++ b/src/assets/images/a1g6/A1G6-piezas_19.png
diff --git a/src/assets/images/a1g6/A1G6-piezas_20.png b/src/assets/images/a1g6/A1G6-piezas_20.png
new file mode 100644
index 0000000..b667a63
--- /dev/null
+++ b/src/assets/images/a1g6/A1G6-piezas_20.png
diff --git a/src/assets/images/a1g6/A1G6-piezas_24.png b/src/assets/images/a1g6/A1G6-piezas_24.png
new file mode 100644
index 0000000..3d3bd73
--- /dev/null
+++ b/src/assets/images/a1g6/A1G6-piezas_24.png
diff --git a/src/assets/images/a1g6/A1G6-piezas_25.png b/src/assets/images/a1g6/A1G6-piezas_25.png
new file mode 100644
index 0000000..cf8a096
--- /dev/null
+++ b/src/assets/images/a1g6/A1G6-piezas_25.png
diff --git a/src/assets/images/a1g6/A1G6-piezas_26.png b/src/assets/images/a1g6/A1G6-piezas_26.png
new file mode 100644
index 0000000..0cb042f
--- /dev/null
+++ b/src/assets/images/a1g6/A1G6-piezas_26.png
diff --git a/src/assets/images/a1g6/A1G6-piezas_29.png b/src/assets/images/a1g6/A1G6-piezas_29.png
new file mode 100644
index 0000000..6ab2be3
--- /dev/null
+++ b/src/assets/images/a1g6/A1G6-piezas_29.png
diff --git a/src/assets/images/a1g6/A1G6-piezas_30.png b/src/assets/images/a1g6/A1G6-piezas_30.png
new file mode 100644
index 0000000..225a84b
--- /dev/null
+++ b/src/assets/images/a1g6/A1G6-piezas_30.png
diff --git a/src/assets/images/a1g6/A1G6-piezas_34.png b/src/assets/images/a1g6/A1G6-piezas_34.png
new file mode 100644
index 0000000..6f053b4
--- /dev/null
+++ b/src/assets/images/a1g6/A1G6-piezas_34.png
diff --git a/src/assets/images/a1g6/A1G6-piezas_36.png b/src/assets/images/a1g6/A1G6-piezas_36.png
new file mode 100644
index 0000000..99013db
--- /dev/null
+++ b/src/assets/images/a1g6/A1G6-piezas_36.png
diff --git a/src/assets/images/a1g7/a1game7.png b/src/assets/images/a1g7/a1game7.png
deleted file mode 100644
index 9f9a3d4..0000000
--- a/src/assets/images/a1g7/a1game7.png
+++ /dev/null
diff --git a/src/assets/images/a1g7/crucigrama-01.png b/src/assets/images/a1g7/crucigrama-01.png
deleted file mode 100755
index 29c82c5..0000000
--- a/src/assets/images/a1g7/crucigrama-01.png
+++ /dev/null
diff --git a/src/assets/images/a1g7/crucigrama-02.png b/src/assets/images/a1g7/crucigrama-02.png
deleted file mode 100644
index 7054b2e..0000000
--- a/src/assets/images/a1g7/crucigrama-02.png
+++ /dev/null
diff --git a/src/assets/images/a1g7/crucigrama-03.png b/src/assets/images/a1g7/crucigrama-03.png
deleted file mode 100644
index e72d0a0..0000000
--- a/src/assets/images/a1g7/crucigrama-03.png
+++ /dev/null
diff --git a/src/assets/images/a1g7/crucigrama-04.png b/src/assets/images/a1g7/crucigrama-04.png
deleted file mode 100644
index 2a396d3..0000000
--- a/src/assets/images/a1g7/crucigrama-04.png
+++ /dev/null
diff --git a/src/assets/images/a1g7/crucigrama-05.png b/src/assets/images/a1g7/crucigrama-05.png
deleted file mode 100755
index 4035981..0000000
--- a/src/assets/images/a1g7/crucigrama-05.png
+++ /dev/null
diff --git a/src/assets/images/a1g7/crucigrama-06.png b/src/assets/images/a1g7/crucigrama-06.png
deleted file mode 100644
index acda0e9..0000000
--- a/src/assets/images/a1g7/crucigrama-06.png
+++ /dev/null
diff --git a/src/assets/images/a1g7/crucigrama-07.png b/src/assets/images/a1g7/crucigrama-07.png
deleted file mode 100644
index 3c9c23b..0000000
--- a/src/assets/images/a1g7/crucigrama-07.png
+++ /dev/null
diff --git a/src/assets/images/a1g7/crucigrama-08.png b/src/assets/images/a1g7/crucigrama-08.png
deleted file mode 100644
index e5848be..0000000
--- a/src/assets/images/a1g7/crucigrama-08.png
+++ /dev/null
diff --git a/src/assets/images/a1g7/crucigrama-09.png b/src/assets/images/a1g7/crucigrama-09.png
deleted file mode 100755
index 018cd90..0000000
--- a/src/assets/images/a1g7/crucigrama-09.png
+++ /dev/null
diff --git a/src/assets/images/a1g7/crucigrama-10.png b/src/assets/images/a1g7/crucigrama-10.png
deleted file mode 100644
index ebaad71..0000000
--- a/src/assets/images/a1g7/crucigrama-10.png
+++ /dev/null
diff --git a/src/assets/images/a1g7/crucigrama-11.png b/src/assets/images/a1g7/crucigrama-11.png
deleted file mode 100644
index bd5dd35..0000000
--- a/src/assets/images/a1g7/crucigrama-11.png
+++ /dev/null
diff --git a/src/assets/images/a1g7/crucigrama-12.png b/src/assets/images/a1g7/crucigrama-12.png
deleted file mode 100755
index b2e27a1..0000000
--- a/src/assets/images/a1g7/crucigrama-12.png
+++ /dev/null
diff --git a/src/assets/images/a1g7/crucigrama-13.png b/src/assets/images/a1g7/crucigrama-13.png
deleted file mode 100755
index 81763c7..0000000
--- a/src/assets/images/a1g7/crucigrama-13.png
+++ /dev/null
diff --git a/src/assets/images/a1g7/crucigrama-14.png b/src/assets/images/a1g7/crucigrama-14.png
deleted file mode 100644
index b35a077..0000000
--- a/src/assets/images/a1g7/crucigrama-14.png
+++ /dev/null
diff --git a/src/assets/images/a1g7/crucigrama-15.png b/src/assets/images/a1g7/crucigrama-15.png
deleted file mode 100644
index 9b2a42d..0000000
--- a/src/assets/images/a1g7/crucigrama-15.png
+++ /dev/null
diff --git a/src/assets/images/a1g7/crucigrama-16.png b/src/assets/images/a1g7/crucigrama-16.png
deleted file mode 100755
index d1c9258..0000000
--- a/src/assets/images/a1g7/crucigrama-16.png
+++ /dev/null
diff --git a/src/assets/images/a1g7/crucigrama-17.png b/src/assets/images/a1g7/crucigrama-17.png
deleted file mode 100644
index a670224..0000000
--- a/src/assets/images/a1g7/crucigrama-17.png
+++ /dev/null
diff --git a/src/assets/images/a1g7/crucigrama-xx.png b/src/assets/images/a1g7/crucigrama-xx.png
deleted file mode 100644
index d8111a4..0000000
--- a/src/assets/images/a1g7/crucigrama-xx.png
+++ /dev/null
diff --git a/src/assets/images/a1g7/fondo01.png b/src/assets/images/a1g7/fondo01.png
deleted file mode 100755
index d7875ed..0000000
--- a/src/assets/images/a1g7/fondo01.png
+++ /dev/null
diff --git a/src/assets/images/a1g7/fondo02.png b/src/assets/images/a1g7/fondo02.png
deleted file mode 100755
index 0393178..0000000
--- a/src/assets/images/a1g7/fondo02.png
+++ /dev/null
diff --git a/src/assets/images/a1g7/fondo03.png b/src/assets/images/a1g7/fondo03.png
deleted file mode 100755
index ffeefdb..0000000
--- a/src/assets/images/a1g7/fondo03.png
+++ /dev/null
diff --git a/src/assets/images/a1g7/fondo04.png b/src/assets/images/a1g7/fondo04.png
deleted file mode 100755
index f664a69..0000000
--- a/src/assets/images/a1g7/fondo04.png
+++ /dev/null
diff --git a/src/assets/images/a1g7/fondo05.png b/src/assets/images/a1g7/fondo05.png
deleted file mode 100755
index f7bd164..0000000
--- a/src/assets/images/a1g7/fondo05.png
+++ /dev/null
diff --git a/src/game/Area1Game1.py b/src/game/Area1Game1.py
index 72531de..ea6df7f 100644
--- a/src/game/Area1Game1.py
+++ b/src/game/Area1Game1.py
@@ -150,12 +150,16 @@ class CArea1Game1(CGameState):
         self.mBad = 0
         self.mGood = 0
         
-        self.mBackground = Image.loadImage('assets/images/a1g1/partes-anatomicas-fondo.png', False)
+        self.mBackground = Image.loadImage('assets/images/a1g1/A1G1-back.png', False)
         CGame().setBackground(self.mBackground)
         
+        self.mBox = CSprite()
+        self.mBox.setXY(450, 600)
+        self.mBox.loadImage('assets/images/a1g1/A1G1-caja.png', True)
+        CGame().addChild(self.mBox)
         
         for i in range(10):
-            self.mListOptions.insert(i, None)
+            #self.mListOptions.insert(i, None)
             self.mListPieces.insert(i, None)
         
         self.mButtonBackA1G1 = CButton()
@@ -169,22 +173,28 @@ class CArea1Game1(CGameState):
         
         # load the pieces
         # parameters: aParent, aNum, aOrigin, aDestine
+        # mamas
         self.mPiece1 = Piece(self, 0, (824.0, 693.0), (487.0, 169.0))
-        self.mPiece1.loadImage('assets/images/a1g1/piece1.png', False)
+        self.mPiece1.loadImage('assets/images/a1g1/A1G1-mamas.png', True)
         size = self.mPiece1.getSize()
         self.mPiece1.setRegistrationPointOffset(size[0] / 2 , size[1] / 2)
         self.mListPieces[0] = self.mPiece1
         CGame().addChild(self.mPiece1)
         
-        self.mPiece9 = Piece(self, 8, (676.0, 680.0), (776.0, 353.0))
-        self.mPiece9.loadImage('assets/images/a1g1/piece9.png', False)
-        size = self.mPiece9.getSize()
-        self.mPiece9.setRegistrationPointOffset(size[0] / 2 , size[1] / 2)
-        self.mListPieces[8] = self.mPiece9
-        CGame().addChild(self.mPiece9)
+        #ovarios
+        #self.mPiece2
+        
+        #utero
+        #self.mPiece3
+        
+        #vagina
+        #self.mPiece4
+        
+        
+  
         
         # load the options
-        self.mOption1 = CSprite()
+        """self.mOption1 = CSprite()
         self.mOption1.setXY(124, 145)
         self.mOption1.loadImage('assets/images/a1g1/option1.png', False)
         size = self.mOption1.getSize()
@@ -192,13 +202,11 @@ class CArea1Game1(CGameState):
         self.mOption1.update()
         self.mListOptions[0] = self.mOption1
 
-        self.mOption9 = CSprite()
-        self.mOption9.setXY(1079, 347)
-        self.mOption9.loadImage('assets/images/a1g1/option9.png', False)
+        
         size = self.mOption9.getSize()
         self.mOption9.setRegistrationPointOffset(size[0] / 2 , size[1] / 2)
         self.mOption9.update()
-        self.mListOptions[8] = self.mOption9
+        self.mListOptions[8] = self.mOption9"""
         
         self.mPoints = CPoints()
         self.mPoints.setXY(250, 10)
@@ -218,16 +226,13 @@ class CArea1Game1(CGameState):
             CGame().setState(ms)
             return
         
-    #def render(self):
-    #    CGameState.render(self)
-    #    print "CMenuState render"
-
     def destroy(self):
         CGameState.destroy(self)
         #self.mInstructions.destroy()
         self.mInstructions = None
         CGame().removeChild(self.mButtonBackA1G1)
         CGame().removeChild(self.mPoints)
+        CGame().removeChild(self.mBox)
         self.mPoints = None
         
         for p in self.mListPieces:
diff --git a/src/game/Area1Game6.py b/src/game/Area1Game6.py
index f182fe4..0beabcf 100644
--- a/src/game/Area1Game6.py
+++ b/src/game/Area1Game6.py
@@ -23,6 +23,9 @@ STATE_ADJUST = 2
 STATE_RETURN = 3
 STATE_OK = 4
 
+DX = 0
+DY = 0
+
 
 #sys.path.insert(0, 'assets/data')
 #import area1game7_data
@@ -170,7 +173,7 @@ class CArea1Game6(CGameState):
         for i in range(10):
             self.mListHelps.insert(i, None)
             
-        for i in range(17):
+        for i in range(18):
             self.mListPieces.insert(i, None)
             
         
@@ -183,80 +186,89 @@ class CArea1Game6(CGameState):
         self.mButtonBack.set_text(_('Volver'))
         CGame().addChild(self.mButtonBack)
         
-        self.mBackground = Image.loadImage('assets/images/a1g7/a1game7.png', False)
+        self.mBackground = Image.loadImage('assets/images/a1g6/A1G6-fondo.png', False)
         CGame().setBackground(self.mBackground)
         
+        self.mBase = CSprite()
+        self.mBase.setXY(0, 0)
+        self.mBase.loadImage('assets/images/a1g6/A1G6-base-crucigrama.png', True)
+        CGame().addChild(self.mBase)
+        
         # load the pieces
         # parameters: aParent, aNum, aOrigin, aDestine
-        self.mPiece1 = Piece(self, 0, (440.0, 520.0), (378.0, 146.0))
-        self.mPiece1.loadImage('assets/images/a1g7/crucigrama-01.png', False)
+        self.mPiece1 = Piece(self, 0, (440.0, 520.0), (DX + 400.0, DY + 50.0))
+        self.mPiece1.loadImage('assets/images/a1g6/A1G6-piezas_03.png')
         #self.mPiece1.setRegistrationPointOffset(27, 27)
         self.mListPieces[0] = self.mPiece1
 
-        self.mPiece2 = Piece(self, 1, (540.0, 520.0), (448.0, 132.0))
-        self.mPiece2.loadImage('assets/images/a1g7/crucigrama-02.png', False)
+        self.mPiece2 = Piece(self, 1, (540.0, 520.0), (DX + 525.0, DY + 25.0))
+        self.mPiece2.loadImage('assets/images/a1g6/A1G6-piezas_04.png')
         self.mListPieces[1] = self.mPiece2
 
-        self.mPiece3 = Piece(self, 2, (640.0, 520.0), (518.0, 132.0))
-        self.mPiece3.loadImage('assets/images/a1g7/crucigrama-03.png', False)
+        self.mPiece3 = Piece(self, 2, (640.0, 520.0), (DX + 650.0, DY + 25.0))
+        self.mPiece3.loadImage('assets/images/a1g6/A1G6-piezas_05.png')
         self.mListPieces[2] = self.mPiece3
         
-        self.mPiece4 = Piece(self, 3, (740.0, 520.0), (294.0, 189.0))
-        self.mPiece4.loadImage('assets/images/a1g7/crucigrama-04.png', False)
+        self.mPiece4 = Piece(self, 3, (740.0, 520.0), (DX + 250.0, DY + 125.0))
+        self.mPiece4.loadImage('assets/images/a1g6/A1G6-piezas_09.png')
         self.mListPieces[3] = self.mPiece4
         
-        self.mPiece5 = Piece(self, 4, (840.0, 520.0), (378.0, 203.0))
-        self.mPiece5.loadImage('assets/images/a1g7/crucigrama-05.png', False)
+        self.mPiece5 = Piece(self, 4, (840.0, 520.0), (DX + 400.0, DY + 150.0))
+        self.mPiece5.loadImage('assets/images/a1g6/A1G6-piezas_10.png')
         self.mListPieces[4] = self.mPiece5
         
-        self.mPiece6 = Piece(self, 5, (940.0, 520.0), (448.0, 189.0))
-        self.mPiece6.loadImage('assets/images/a1g7/crucigrama-06.png', False)
+        self.mPiece6 = Piece(self, 5, (940.0, 520.0), (DX + 525.0, DY + 125.0))
+        self.mPiece6.loadImage('assets/images/a1g6/A1G6-piezas_11.png')
         self.mListPieces[5] = self.mPiece6
         
         self.mPiece7 = Piece(self, 6, (1040.0, 520.0), (209.0, 245.0))
-        self.mPiece7.loadImage('assets/images/a1g7/crucigrama-07.png', False)
+        self.mPiece7.loadImage('assets/images/a1g6/A1G6-piezas_16.png')
         self.mListPieces[6] = self.mPiece7
         
         self.mPiece8 = Piece(self, 7, (440.0, 620.0), (293.0, 245.0))
-        self.mPiece8.loadImage('assets/images/a1g7/crucigrama-08.png', False)
+        self.mPiece8.loadImage('assets/images/a1g6/A1G6-piezas_17.png')
         self.mListPieces[7] = self.mPiece8
         
         self.mPiece9 = Piece(self, 8, (540.0, 620.0), (350.0, 259.0))
-        self.mPiece9.loadImage('assets/images/a1g7/crucigrama-09.png', False)
+        self.mPiece9.loadImage('assets/images/a1g6/A1G6-piezas_18.png')
         self.mListPieces[8] = self.mPiece9
         
         self.mPiece10 = Piece(self, 9, (640.0, 620.0), (406.0, 245.0))
-        self.mPiece10.loadImage('assets/images/a1g7/crucigrama-10.png', False)
+        self.mPiece10.loadImage('assets/images/a1g6/A1G6-piezas_19.png')
         self.mListPieces[9] = self.mPiece10
         
         self.mPiece11 = Piece(self, 10, (740.0, 620.0), (490.0, 245.0))
-        self.mPiece11.loadImage('assets/images/a1g7/crucigrama-11.png', False)
+        self.mPiece11.loadImage('assets/images/a1g6/A1G6-piezas_20.png')
         self.mListPieces[10] = self.mPiece11
         
         self.mPiece12 = Piece(self, 11, (840.0, 620.0), (308.0, 316.0))
-        self.mPiece12.loadImage('assets/images/a1g7/crucigrama-12.png', False)
+        self.mPiece12.loadImage('assets/images/a1g6/A1G6-piezas_24.png')
         self.mListPieces[11] = self.mPiece12
         
         self.mPiece13 = Piece(self, 12, (940.0, 620.0), (350.0, 330.0))
-        self.mPiece13.loadImage('assets/images/a1g7/crucigrama-13.png', False)
+        self.mPiece13.loadImage('assets/images/a1g6/A1G6-piezas_25.png')
         self.mListPieces[12] = self.mPiece13
         
         self.mPiece14 = Piece(self, 13, (1040.0, 620.0), (406.0, 316.0))
-        self.mPiece14.loadImage('assets/images/a1g7/crucigrama-14.png', False)
+        self.mPiece14.loadImage('assets/images/a1g6/A1G6-piezas_26.png')
         self.mListPieces[13] = self.mPiece14
         
         self.mPiece15 = Piece(self, 14, (440.0, 720.0), (462.0, 330.0))
-        self.mPiece15.loadImage('assets/images/a1g7/crucigrama-15.png', False)
+        self.mPiece15.loadImage('assets/images/a1g6/A1G6-piezas_29.png')
         self.mListPieces[14] = self.mPiece15
         
         self.mPiece16 = Piece(self, 15, (540.0, 720.0), (350.0, 415.0))
-        self.mPiece16.loadImage('assets/images/a1g7/crucigrama-16.png', False)
+        self.mPiece16.loadImage('assets/images/a1g6/A1G6-piezas_30.png')
         self.mListPieces[15] = self.mPiece16
         
         self.mPiece17 = Piece(self, 16, (640.0, 720.0), (280.0, 415.0))
-        self.mPiece17.loadImage('assets/images/a1g7/crucigrama-17.png', False)
+        self.mPiece17.loadImage('assets/images/a1g6/A1G6-piezas_34.png')
         self.mListPieces[16] = self.mPiece17
         
+        self.mPiece18 = Piece(self, 16, (650.0, 720.0), (280.0, 415.0))
+        self.mPiece18.loadImage('assets/images/a1g6/A1G6-piezas_36.png')
+        self.mListPieces[17] = self.mPiece18
+        
         # add pieces from the list to the game
         for piece in self.mListPieces:
             x , y = piece.getSize()
@@ -265,7 +277,7 @@ class CArea1Game6(CGameState):
 
         
         # sprites for the mouseover events
-        self.mWord01 = CSprite()
+        """self.mWord01 = CSprite()
         self.mWord01.loadImage('assets/images/a1g7/fondo01.png', False)
         self.mWord01.setXY(448, 74)
         #CGame().addChild(self.mWord01)
@@ -273,7 +285,7 @@ class CArea1Game6(CGameState):
         self.mWord02 = CSprite()
         self.mWord02.loadImage('assets/images/a1g7/fondo02.png', False)
         self.mWord02.setXY(410, 152)
-        #CGame().addChild(self.mWord02)
+        #CGame().addChild(self.mWord02)"""
         
         
         self.loadInfo()
@@ -313,11 +325,11 @@ class CArea1Game6(CGameState):
             CGame().setState(ms)
             return
             
-        elif self.mWord01.mouseOver():
+        """elif self.mWord01.mouseOver():
             self.mHelpActive = self.mHelp01
             
         elif self.mWord02.mouseOver():
-            self.mHelpActive = self.mHelp02
+            self.mHelpActive = self.mHelp02"""
             
         # this optimize the repetitive remove/add the same sprite
         if not (self.mHelpPrevious == self.mHelpActive):
@@ -328,9 +340,6 @@ class CArea1Game6(CGameState):
             CGame().addChild(self.mHelpActive)
             self.mHelpPrevious = self.mHelpActive
         
-    #def render(self):
-    #    CGameState.render(self)
-    #    print "CMenuState render"
         
     def destroy(self):
         CGameState.destroy(self)
@@ -338,7 +347,7 @@ class CArea1Game6(CGameState):
         self.mInstructions = None
         CGame().removeChild(self.mButtonBack)
         CGame().removeChild(self.mPoints)
-        
+        CGame().removeChild(self.mBase)
         
         # remove pieces from the game
         for piece in self.mListPieces: