fix end with new state a1g3

1 files changed, 37 insertions, 35 deletions

diff --git a/src/game/Area1Game3.py b/src/game/Area1Game3.py
index 4640e79..762145f 100644
--- a/src/game/Area1Game3.py
+++ b/src/game/Area1Game3.py
@@ -107,6 +107,14 @@ class CArea1Game3(CGameState):
         self.mButtonFalse.size = (200, 40)
         self.mButtonFalse.set_text(_('Falso'))
         
+        self.mButtonNext = CButton()
+        self.mButtonNext.bgColor = (125, 255, 125)
+        self.mButtonNext.font = font28
+        self.mButtonNext.center = (600, 500)
+        self.mButtonNext.size = (200, 40)
+        self.mButtonNext.set_text(_('Siguiente'))
+        CGame().addChild(self.mButtonNext)
+        
         self.mBoy = CSprite(100, 400)
         self.mBoy.loadImage('assets/images/a1g3/Juan-chico-costado-parado.png')
         CGame().addChild(self.mBoy)
@@ -139,15 +147,12 @@ class CArea1Game3(CGameState):
         self.mPoints = CPoints(250, 10)
         CGame().addChild(self.mPoints)
         
-        #self.mTime = self.mDialogBoy1.getTimeState()
         self.mCurrentState = 0
         self.time = 0
                 
     def update(self):
         CGameState.update(self)
 
-        self.time = self.time + 1
-        
         if self.mButtonBack.mouseOver():
             if not(self.mBsetted):
                 self.mBsetted = True
@@ -166,40 +171,37 @@ class CArea1Game3(CGameState):
             hs = HallState.CHallState()
             CGame().setState(hs)
             hs.setCurrentGame(2)
-            return           
-
-        if self.mCurrentState == 0:
-            #self.time = self.mListDialogs[0].getTimeState()
-            if self.time > 4*30:
-                CGame().removeChild(self.mDialogBoy1)
-                CGame().addChild(self.mDialogGirl1)
-                self.mCurrentState = 1
-                self.time = 0
-                #self.mListDialogs[1].setTimeState(0)
-                
-        elif self.mCurrentState == 1:
-            #self.time = self.mListDialogs[1].getTimeState()
-            if self.time > 3*30:
-                CGame().removeChild(self.mDialogGirl1)
-                CGame().addChild(self.mDialogBoy2)
-                self.mCurrentState = 2
-                self.time = 0
-                #self.mListDialogs[2].setTimeState(0)
+            return
         
-        elif self.mCurrentState == 2:
-            #self.time = self.mListDialogs[2].getTimeState()
-            if self.time > 3*30:
-                CGame().removeChild(self.mDialogBoy2)
-                self.mCurrentState = 3
+        if self.mCurrentState < 4:
+            if self.mButtonNext.clicked():
+                self.mCurrentState = self.mCurrentState + 1
+    
+                if self.mCurrentState == 1:
+                    CGame().removeChild(self.mDialogBoy1)
+                    CGame().addChild(self.mDialogGirl1)
+                    
+                elif self.mCurrentState == 2:
+                    CGame().removeChild(self.mDialogGirl1)
+                    CGame().addChild(self.mDialogBoy2)
+    
+                elif self.mCurrentState == 3:
+                    CGame().removeChild(self.mDialogBoy2)
+                    self.mCurrentState = 4
+                    CGame().removeChild(self.mButtonNext)
         
         # Pregunta
-        elif self.mCurrentState == 3:
+        elif self.mCurrentState == 4:
+            self.time = self.time + 1
+            
             if self.mQuestionShowed == False:
-                self.next_questionB()
-                CGame().addChild(self.mLabelQuestion)
-                CGame().addChild(self.mButtonTrue)
-                CGame().addChild(self.mButtonFalse)
-                self.mQuestionShowed = True
+                if self.next_questionB():
+                    CGame().addChild(self.mLabelQuestion)
+                    CGame().addChild(self.mButtonTrue)
+                    CGame().addChild(self.mButtonFalse)
+                    self.mQuestionShowed = True
+                else:
+                    self.mCurrentState = 5
                 
             elif (self.mQuestionAnswered == False):
                 if self.mButtonTrue.clicked():
@@ -233,8 +235,7 @@ class CArea1Game3(CGameState):
                     self.time = 0
                     
             elif self.mQuestionAnswered == True:
-                #self.time = self.mActiveDialog.getTimeState()
-                if self.time > 3*30:
+                if self.time > 2*30:
                     CGame().removeChild(self.mDialogGood)
                     CGame().removeChild(self.mDialogBad)
                     self.mQuestionShowed = False
@@ -271,6 +272,7 @@ class CArea1Game3(CGameState):
         CGame().removeChild(self.mLabelQuestion)
         CGame().removeChild(self.mButtonTrue)
         CGame().removeChild(self.mButtonFalse)
+        CGame().removeChild(self.mButtonNext)
         CGame().removeChild(self.mBoy)
         CGame().removeChild(self.mGirl)
         CGame().removeChild(self.mDialogBoy1)