change code in a1g1 for the new images examples

3 files changed, 14 insertions, 36 deletions

diff --git a/src/assets/images/area1.png b/src/assets/images/area1.png
deleted file mode 100644
index 7a1e9e6..0000000
--- a/src/assets/images/area1.png
+++ /dev/null
diff --git a/src/assets/images/area2.png b/src/assets/images/area2.png
deleted file mode 100644
index a9a75ab..0000000
--- a/src/assets/images/area2.png
+++ /dev/null
diff --git a/src/states/Area1Game1.py b/src/states/Area1Game1.py
index 0367320..46aba50 100755
--- a/src/states/Area1Game1.py
+++ b/src/states/Area1Game1.py
@@ -103,7 +103,9 @@ class Piece(CSprite):
 
         if (self.mState == STATE_ADJUST):
             if (Math.dist(self.mPos.getX() , self.mPos.getY(), self.mDest.getX(), self.mDest.getY()) < self.RADIUS_COLLISION):
-                self.mParent.mOption1.set_bgColor((0x19, 0x1C, 0xC0))
+                #self.mParent.mOption1.set_bgColor((0x19, 0x1C, 0xC0))
+                #self.mParent.mOption1.set_fgColor((0xE2, 0x1F, 0x1F))
+                CGame().addChild(self.mParent.mOption1)
                 self.setState(STATE_OK)
                 
 
@@ -182,51 +184,32 @@ class CArea1Game1(CGameState):
         #TODO: Create a function to create image.
         self.mButtonBack.set_bgColor((0x99, 0x99, 0x66))
         self.mButtonBack.font = pygame.font.Font('assets/fonts/fipps.ttf', 20)
-        self.mButtonBack.setCenter((110, 420))
+        self.mButtonBack.setCenter((110, 650))
         self.mButtonBack.set_size((200, 40))  
         self.mButtonBack.set_text('Volver')
         CGame().addChild(self.mButtonBack)
         
-        self.mBackground = Image.loadImage('assets/images/back_game.png', False)
+        self.mBackground = Image.loadImage('assets/images/a1game1.png', False)
         CGame().setBackground(self.mBackground)
         
-        # load the zone 1 and 2 for the objects
-        self.mArea1 = CSprite()
-        self.mArea1.setImage('assets/images/area1.png', False)
-        self.mArea1.setXY(400, 200)
-        self.mArea1.center = (400, 200)
-        CGame().addChild(self.mArea1)
-        
-        self.mArea2 = CSprite()
-        self.mArea2.setImage('assets/images/area2.png', False)
-        self.mArea2.setXY(700, 200)
-        CGame().addChild(self.mArea2)
 
         self.mPiece1 = Piece()
         self.mPiece1.set_parent(self)
         self.mPiece1.setImage('assets/images/piece1.png', False)
-        self.mPiece1.set_origin(CVector(350.0, 600.0))
-        self.mPiece1.set_destine(CVector(435.0, 283.0))
+        self.mPiece1.set_origin(CVector(824.0, 693.0))
+        self.mPiece1.set_destine(CVector(487.0, 169.0))
         self.mPiece1.setState(STATE_STALE)
         #self.mPiece1.setXY(700, 200)
         
         CGame().addChild(self.mPiece1)
         
-        self.mOption1 = CLabel()
-        self.mOption1.set_center((100, 100))
-        self.mOption1.set_size((100, 30))
-        self.mOption1.set_text('Option 1')
-        
-        self.mOption2 = CLabel()
-        self.mOption2.set_center((100, 140))
-        self.mOption2.set_size((100, 30))
-        self.mOption2.set_text('Option 2')
-        
-
+        self.mOption1 = CSprite()
+        self.mOption1.setXY(124, 145)
+        self.mOption1.setImage('assets/images/option1.png', False)
+        self.mOption1.update()
+        #CGame().addChild(self.mOption1)
         
-        CGame().addChild(self.mOption1)
-        CGame().addChild(self.mOption2)
-
+       
         
     def update(self):
         #print "menu update"
@@ -247,19 +230,14 @@ class CArea1Game1(CGameState):
         #self.mInstructions.destroy()
         self.mInstructions = None
         CGame().removeChild(self.mButtonBack)
-        CGame().removeChild(self.mArea1)
-        CGame().removeChild(self.mArea2)
         CGame().removeChild(self.mPiece1)
         CGame().removeChild(self.mOption1)
-        CGame().removeChild(self.mOption2)
         #self.mButtonPlay.destroy()
         self.mButtonBack = None
         self.mBackground = None
-        self.mArea1 = None
-        self.mArea2 = None
         self.mPiece1 = None
         self.mOption1 = None
-        self.mOption2 = None
+
         print "CArea1Game1 destroy"
         
     def doEvents(self, aEvent):