cleans in a1g3

2 files changed, 9 insertions, 32 deletions

diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index cce5c87..a4526c9 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -3,6 +3,7 @@ encoding//src/Main.py=utf-8
 encoding//src/api/Button.py=utf-8
 encoding//src/api/Game.py=utf-8
 encoding//src/api/GameState.py=utf-8
+encoding//src/api/Globe.py=utf-8
 encoding//src/api/Label.py=utf-8
 encoding//src/api/Math.py=utf-8
 encoding//src/api/Mouse.py=utf-8
diff --git a/src/game/Area1Game3.py b/src/game/Area1Game3.py
index 745937a..fdbea29 100644
--- a/src/game/Area1Game3.py
+++ b/src/game/Area1Game3.py
@@ -88,76 +88,52 @@ class CArea1Game3(CGameState):
         CGame().addChild(self.mButtonBackA1G3)
 
         self.mLabelQuestion = Globe((500, 250), pico='None', text=' ')
-        #self.mLabelQuestion = CMultiLabel()
-        #self.mLabelQuestion.set_bgColor((0x99, 0x50, 0x99))
-        #self.mLabelQuestion.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 13)
         self.mLabelQuestion.set_center((600, 250))
-        #self.mLabelQuestion.set_size((600, 150))
 
         self.mButtonTrue = CButton()
-        self.mButtonTrue.set_bgColor((0x99, 0x99, 0x66))
+        self.mButtonTrue.set_bgColor((125, 255, 125))
         self.mButtonTrue.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 20)
         self.mButtonTrue.set_center((460, 400))
-        self.mButtonTrue.set_size((200, 40))  
+        self.mButtonTrue.set_size((200, 40))
         self.mButtonTrue.set_text(_('Verdadero'))
         
         self.mButtonFalse = CButton()
-        self.mButtonFalse.set_bgColor((0x99, 0x99, 0x66))
+        self.mButtonFalse.set_bgColor((125, 255, 125))
         self.mButtonFalse.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 20)
         self.mButtonFalse.set_center((740, 400))
         self.mButtonFalse.set_size((200, 40))  
         self.mButtonFalse.set_text(_('Falso'))
         
         self.mBoy = CSprite()
-        self.mBoy.loadImage('assets/images/a1g3/boy1.png', False)
+        self.mBoy.loadImage('assets/images/a1g3/Juan-chico-costado-parado.png')
         self.mBoy.setXY(100, 400)
         CGame().addChild(self.mBoy)
         
+        elisa = Image.loadImage('assets/images/a1g3/Elisa-chica-costado-parada.png')
+        elisa_rotated = pygame.transform.flip(elisa, True, False)
         self.mGirl = CSprite()
-        self.mGirl.loadImage('assets/images/a1g3/boy2.png', False)
+        self.mGirl.setImage(elisa_rotated)
         self.mGirl.setXY(900, 400)
         CGame().addChild(self.mGirl)
 
         # sabes que le pasa
-        self.mDialogBoy1 = Globe((300, 150), text=self.mDialog[0])
+        self.mDialogBoy1 = Globe((300, 170), text=self.mDialog[0])
         self.mDialogBoy1.set_center((300, 300))
         CGame().addChild(self.mDialogBoy1)
         
-        """self.mDialogBoy1 = CMultiLabel()
-        self.mDialogBoy1.set_center((300, 200))
-        self.mDialogBoy1.set_size((300, 200))
-        self.mDialogBoy1.set_text(self.mDialog[0])
-        CGame().addChild(self.mDialogBoy1)"""
-        
         # si
         self.mDialogGirl1 = Globe((200, 100), pico='right', text=self.mDialog[1])
         self.mDialogGirl1.set_center((900, 300))
-        """self.mDialogGirl1 = CMultiLabel()
-        self.mDialogGirl1.set_center((800, 200))
-        self.mDialogGirl1.set_size((200, 50))
-        self.mDialogGirl1.set_text(self.mDialog[1])"""
         
         # a ver..
         self.mDialogBoy2 = Globe((200, 100), pico='left', text=self.mDialog[2])
         self.mDialogBoy2.set_center((300, 300))
-        """self.mDialogBoy2 = CMultiLabel()
-        self.mDialogBoy2.set_center((300, 200))
-        self.mDialogBoy2.set_size((200, 50))
-        self.mDialogBoy2.set_text(self.mDialog[2])"""
         
         self.mDialogGood = Globe((200, 75), pico='left', text=self.mGoodA)
         self.mDialogGood.set_center((300, 300))
-        """self.mDialogGood = CMultiLabel()
-        self.mDialogGood.set_center((400, 200))
-        self.mDialogGood.set_size((200, 50))
-        self.mDialogGood.set_text(self.mGoodA)"""
         
         self.mDialogBad = Globe((200, 75), pico='left', text=self.mBadA)
         self.mDialogBad.set_center((300, 300))
-        """self.mDialogBad = CMultiLabel()
-        self.mDialogBad.set_center((400, 200))
-        self.mDialogBad.set_size((200, 50))
-        self.mDialogBad.set_text(self.mBadA)"""
               
         self.mPoints = CPoints()
         self.mPoints.setXY(250, 10)